From 90bb4835a1cb49082121e6d94ceb5c1afceb1b5f Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 2 May 2009 14:22:56 -0500 Subject: [PATCH] * bin/cpu-count: don't echo blank line in detailed status * bin/updates-available: print "None" in detailed status, if no updates are available Signed-off-by: Dustin Kirkland --- bin/cpu-count | 3 +-- bin/updates-available | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/cpu-count b/bin/cpu-count index 5f4f9b9a..42b052f7 100755 --- a/bin/cpu-count +++ b/bin/cpu-count @@ -18,8 +18,7 @@ # along with this program. If not, see . count=`grep -c "^processor.*:" /proc/cpuinfo` -[ "$count" = "1" ] || echo $count"x" +[ "$count" = "1" ] || printf "%sx" "$count" if [ "$1" = "--detail" ]; then - echo exit 0 fi diff --git a/bin/updates-available b/bin/updates-available index 18cb7517..13b9d61d 100755 --- a/bin/updates-available +++ b/bin/updates-available @@ -19,7 +19,12 @@ if [ "$1" = "--detail" ]; then if [ -x "/usr/bin/apt-get" ]; then - /usr/bin/apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst | sed "s/^Inst //" + out=`/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst | sed "s/^Inst //"` + if [ -z "$out" ]; then + printf "None" + else + printf "$out" + fi fi exit 0 fi