From 564a708d6af90b1bc5bf4d13e7ad80abca92ad74 Mon Sep 17 00:00:00 2001 From: Thiago Perrotta Date: Sun, 2 Mar 2014 14:47:35 -0300 Subject: [PATCH] added the linux implementation to the battery plugin --- plugins/battery/battery.plugin.zsh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 16ad3e651..670c6a47d 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -58,9 +58,19 @@ if [[ $(uname) == "Darwin" ]] ; then elif [[ $(uname) == "Linux" ]] ; then + function battery_is_charging() { + ! [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] + } + + function battery_pct() { + echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" + } + function battery_pct_remaining() { - if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then - echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" + if [ ! $(battery_is_charging) ] ; then + battery_pct + else + echo "External Power" fi } @@ -86,15 +96,6 @@ elif [[ $(uname) == "Linux" ]] ; then fi } - function battery_pct() { - # todo for on linux - } - - function battery_is_charging() { - # todo on linux - false - } - else # Empty functions so we don't cause errors in prompts function battery_pct_remaining() {