From 9eaa9598d24d0a10f546c6dbd5ff652a44510676 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 27 May 2019 03:13:47 +0800 Subject: [PATCH] * usr/lib/byobu/processes: - Handle stderr for ps, e.g. unsupported options - Remove unnecessary awk call; wc -l only outputs one value --- debian/changelog | 3 +++ usr/lib/byobu/processes | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 624744f1..6f8f6984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ byobu (5.128) unreleased; urgency=medium available * usr/lib/byobu/logo: - Add logo for OpenWrt + * usr/lib/byobu/processes: + - Handle stderr for ps, e.g. unsupported options + - Remove unnecessary awk call; wc -l only outputs one value * usr/share/byobu/keybindings/f-keys.tmux: - Remove -k for new-window. In older versions of tmux, -k without -t had no effect. In tmux 2.8, -k without -t will diff --git a/usr/lib/byobu/processes b/usr/lib/byobu/processes index 6e5ae29f..7049691e 100755 --- a/usr/lib/byobu/processes +++ b/usr/lib/byobu/processes @@ -20,15 +20,15 @@ # along with this program. If not, see . __processes_detail() { - ps -ej + ps -ej 2>/dev/null } __processes() { local count= if [ -r /proc ]; then - count=$(ls -d /proc/[0-9]* 2>/dev/null| wc -l) + count=$(ls -d /proc/[0-9]* 2>/dev/null | wc -l) else - count=$(ps -ef | wc -l | awk '{print $1}') + count=$(ps -ef | wc -l) fi [ -n "$count" ] || return color b y w; printf "%s" "$count"; color -; color y w; printf "&"; color --