* 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
This commit is contained in:
Dustin Kirkland 2011-01-28 15:41:07 -06:00
commit f207775f5f
5 changed files with 17 additions and 14 deletions

5
debian/changelog vendored
View file

@ -1,6 +1,9 @@
byobu (3.27) unreleased; urgency=low 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 <kirkland@ubuntu.com> Thu, 27 Jan 2011 10:24:10 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 27 Jan 2011 10:24:10 -0600

View file

@ -32,10 +32,14 @@ if [ ! -x "$BYOBU_PREFIX/bin/$PKG" ]; then
fi fi
# Add a version argument for debugging purposes # Add a version argument for debugging purposes
if [ "$#" = "1" ] && [ "$1" = "-v" ]; then if [ "$#" = "1" ]; then
echo "$PKG version $VERSION" case "$1" in
screen -v -v|--version)
exit 0 echo "$PKG version $VERSION"
screen -v
exit 0
;;
esac
fi fi
# Check if we're being autolaunched, and this user explicitly does not want it. # Check if we're being autolaunched, and this user explicitly does not want it.

View file

@ -21,5 +21,5 @@ if [ "$1" = "--detail" ]; then
grep -i "^model name" /proc/cpuinfo grep -i "^model name" /proc/cpuinfo
exit 0 exit 0
fi 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" [ "$count" = "1" ] || printf "%sx" "$count"

View file

@ -22,13 +22,9 @@ PKG="byobu"
color 2>/dev/null || color() { true; } color 2>/dev/null || color() { true; }
DIR="/sys/class/hwmon" DIR="/sys/class/hwmon"
if [ "$1" = "--detail" ]; then
for i in $DIR/* /proc/i8k; do # Nothing interesting to say here about fan speed
echo "$i:" [ "$1" = "--detail" ] && exit 0
cat "$DIR/$i"/* 2>/dev/null
done
exit 0
fi
# Let's check a few different probes for fan speed # Let's check a few different probes for fan speed

View file

@ -43,7 +43,7 @@ backtick 100 599 599 byobu-status release
backtick 101 7 7 byobu-status updates_available backtick 101 7 7 byobu-status updates_available
backtick 102 5 5 byobu-status reboot_required backtick 102 5 5 byobu-status reboot_required
backtick 103 2 2 byobu-status cpu_freq 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 105 47 47 byobu-status mem_available
backtick 106 2 2 byobu-status load_average backtick 106 2 2 byobu-status load_average
backtick 107 13 13 byobu-status mem_used backtick 107 13 13 byobu-status mem_used