diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-16 18:46:50 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-16 18:46:50 -0700 |
| commit | 23a43e9fd62828b7b80f770080a8efc1fceecc35 (patch) | |
| tree | f673880202e78a978fec8142f4f26bf3c8cb2206 /plugins/battery | |
| parent | 080409a5a71359021c347a4e23e29e9514ef151a (diff) | |
| parent | 564a708d6af90b1bc5bf4d13e7ad80abca92ad74 (diff) | |
| download | zsh-23a43e9fd62828b7b80f770080a8efc1fceecc35.tar.gz zsh-23a43e9fd62828b7b80f770080a8efc1fceecc35.tar.bz2 zsh-23a43e9fd62828b7b80f770080a8efc1fceecc35.zip | |
Merge pull request #2574 from thiagowfx/linux-battery
added the linux implementation to the battery plugin
Diffstat (limited to 'plugins/battery')
| -rw-r--r-- | plugins/battery/battery.plugin.zsh | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index e39cc5b8f..ae2261ecd 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -62,9 +62,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 } @@ -90,15 +100,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() { |