diff --git a/debian/changelog b/debian/changelog index fe3ee7ad..898a9e98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ byobu (3.20) unreleased; urgency=low - add an option for -n|--no-logout to byobu-launcher-install, document changes in new manpages, LP: #604931 * usr/lib/byobu/cpu_temp: find the temp monitor, LP: #676080 + * usr/lib/byobu/battery, usr/share/man/man1/byobu.1: allow for + overriding detected BATTERY, LP: #693560 -- Dustin Kirkland Tue, 28 Dec 2010 00:05:13 -0600 diff --git a/usr/lib/byobu/battery b/usr/lib/byobu/battery index b8fbdca3..1c97efd6 100755 --- a/usr/lib/byobu/battery +++ b/usr/lib/byobu/battery @@ -37,7 +37,7 @@ if [ "$1" = "--detail" ]; then exit 0 fi -for bat in /proc/acpi/battery/*; do +for bat in $BATTERY /proc/acpi/battery/*; do # make sure that this battery is present infofile=$(cat "$bat/info") present=$(search "$infofile" "present: *\(.*\)") diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1 index 9bb3ef8a..c1fea4c8 100644 --- a/usr/share/man/man1/byobu.1 +++ b/usr/share/man/man1/byobu.1 @@ -20,7 +20,7 @@ Note that DATA=\fI$HOME/.byobu\fP. \fBarch\fP \- system architecture; displayed on the lower bar toward the left, in the default text color on the default background color -\fBbattery\fP \- battery information; display on the lower bar toward the right; |\-| indicates discharging, |+| indicates charging, |=| indicates fully charged; when charging or discharging, the current battery capacity as a percentage is displayed; the colours green, yellow, and red are used to give further indication of the battery's charge state +\fBbattery\fP \- battery information; display on the lower bar toward the right; |\-| indicates discharging, |+| indicates charging, |=| indicates fully charged; when charging or discharging, the current battery capacity as a percentage is displayed; the colours green, yellow, and red are used to give further indication of the battery's charge state; you may override the detected battery by setting BATTERY=/proc/acpi/battery/BAT0 in \fI$DATA/statusrc\fP \fBcpu_count\fP \- the number of cpu's or cores on the system; displayed in the lower bar toward the right in the default text color on the default background, followed by a trailing 'x'