diff --git a/debian/changelog b/debian/changelog index f87999a5..b1077481 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ byobu (3.27) unreleased; urgency=low - * UNRELEASED + * usr/bin/byobu: -v|--version + * usr/lib/byobu/fan_speed: drop detail section, nothing interesting here + * usr/share/byobu/profiles/common: accommodate for powernap's off- and on- + lining of processors dynamically -- Dustin Kirkland Thu, 27 Jan 2011 10:24:10 -0600 diff --git a/usr/bin/byobu b/usr/bin/byobu index 08d9d298..30dba006 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -32,10 +32,14 @@ if [ ! -x "$BYOBU_PREFIX/bin/$PKG" ]; then fi # Add a version argument for debugging purposes -if [ "$#" = "1" ] && [ "$1" = "-v" ]; then - echo "$PKG version $VERSION" - screen -v - exit 0 +if [ "$#" = "1" ]; then + case "$1" in + -v|--version) + echo "$PKG version $VERSION" + screen -v + exit 0 + ;; + esac fi # Check if we're being autolaunched, and this user explicitly does not want it. diff --git a/usr/lib/byobu/cpu_count b/usr/lib/byobu/cpu_count index e7233921..87d86cae 100755 --- a/usr/lib/byobu/cpu_count +++ b/usr/lib/byobu/cpu_count @@ -21,5 +21,5 @@ if [ "$1" = "--detail" ]; then grep -i "^model name" /proc/cpuinfo exit 0 fi -count=`getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo` +count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo) [ "$count" = "1" ] || printf "%sx" "$count" diff --git a/usr/lib/byobu/fan_speed b/usr/lib/byobu/fan_speed index 195df432..3ca44f8c 100755 --- a/usr/lib/byobu/fan_speed +++ b/usr/lib/byobu/fan_speed @@ -22,13 +22,9 @@ PKG="byobu" color 2>/dev/null || color() { true; } DIR="/sys/class/hwmon" -if [ "$1" = "--detail" ]; then - for i in $DIR/* /proc/i8k; do - echo "$i:" - cat "$DIR/$i"/* 2>/dev/null - done - exit 0 -fi + +# Nothing interesting to say here about fan speed +[ "$1" = "--detail" ] && exit 0 # Let's check a few different probes for fan speed diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index 4c29a3a5..9d9f7eb2 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -43,7 +43,7 @@ backtick 100 599 599 byobu-status release backtick 101 7 7 byobu-status updates_available backtick 102 5 5 byobu-status reboot_required backtick 103 2 2 byobu-status cpu_freq -backtick 104 43 43 byobu-status cpu_count +backtick 104 5 5 byobu-status cpu_count backtick 105 47 47 byobu-status mem_available backtick 106 2 2 byobu-status load_average backtick 107 13 13 byobu-status mem_used