* usr/lib/byobu/battery:

- Use `POWER_SUPPLY_CAPACITY` for battery if available
This commit is contained in:
Dustin Kirkland 2016-04-07 16:04:59 -05:00
commit b033dd1a15
2 changed files with 6 additions and 1 deletions

5
debian/changelog vendored
View file

@ -1,5 +1,6 @@
byobu (5.105) unreleased; urgency=medium byobu (5.105) unreleased; urgency=medium
[ Dustin Kirkland ]
* usr/share/man/man1/byobu.1: * usr/share/man/man1/byobu.1:
- update examples - update examples
* debian/control: * debian/control:
@ -12,6 +13,10 @@ byobu (5.105) unreleased; urgency=medium
* usr/share/byobu/profiles/bashrc: * usr/share/byobu/profiles/bashrc:
- fix color comment - fix color comment
[ Mark King ]
* usr/lib/byobu/battery:
- Use `POWER_SUPPLY_CAPACITY` for battery if available
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 28 Feb 2016 23:46:26 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 28 Feb 2016 23:46:26 -0600
byobu (5.104-0ubuntu1) xenial; urgency=medium byobu (5.104-0ubuntu1) xenial; urgency=medium

View file

@ -41,11 +41,11 @@ __battery() {
case "$POWER_SUPPLY_NAME" in AC|ac|Ac|aC) continue ;; esac case "$POWER_SUPPLY_NAME" in AC|ac|Ac|aC) continue ;; esac
present="$POWER_SUPPLY_PRESENT" present="$POWER_SUPPLY_PRESENT"
# Some use "CHARGE", others use "ENERGY", still others "CAPACITY" # Some use "CHARGE", others use "ENERGY", still others "CAPACITY"
#[ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100"
[ -n "$POWER_SUPPLY_CHARGE_FULL" ] && full=$((POWER_SUPPLY_CHARGE_FULL+full)) [ -n "$POWER_SUPPLY_CHARGE_FULL" ] && full=$((POWER_SUPPLY_CHARGE_FULL+full))
[ -n "$POWER_SUPPLY_ENERGY_FULL" ] && full=$((POWER_SUPPLY_ENERGY_FULL+full)) [ -n "$POWER_SUPPLY_ENERGY_FULL" ] && full=$((POWER_SUPPLY_ENERGY_FULL+full))
[ -n "$POWER_SUPPLY_CHARGE_NOW" ] && rem=$((POWER_SUPPLY_CHARGE_NOW+rem)) [ -n "$POWER_SUPPLY_CHARGE_NOW" ] && rem=$((POWER_SUPPLY_CHARGE_NOW+rem))
[ -n "$POWER_SUPPLY_ENERGY_NOW" ] && rem=$((POWER_SUPPLY_ENERGY_NOW+rem)) [ -n "$POWER_SUPPLY_ENERGY_NOW" ] && rem=$((POWER_SUPPLY_ENERGY_NOW+rem))
[ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100"
[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS" [ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
fi fi
;; ;;