diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-23 20:01:40 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-23 20:01:40 -0700 |
| commit | 7787d1da6e27f3e8fc6035254a5bd912c21893e6 (patch) | |
| tree | ddab9d208a66d02a41b82a2c16d95253587f2715 /plugins/battery | |
| parent | 1235b77effa13dbb12de7056f8c73f7f820c061b (diff) | |
| parent | fdd46d8815f9c3a314e13d2dbb57685fd78f4e7c (diff) | |
| download | zsh-7787d1da6e27f3e8fc6035254a5bd912c21893e6.tar.gz zsh-7787d1da6e27f3e8fc6035254a5bd912c21893e6.tar.bz2 zsh-7787d1da6e27f3e8fc6035254a5bd912c21893e6.zip | |
Merge pull request #1641 from NeuralSandwich/master
Battery plugin updates
Diffstat (limited to 'plugins/battery')
| -rw-r--r-- | plugins/battery/battery.plugin.zsh | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 0c7c9421f..66bf46d13 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -46,17 +46,27 @@ if [[ $(uname) == "Darwin" ]] ; then fi echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" else - echo "" + echo "∞" fi } elif [[ $(uname) == "Linux" ]] ; then - if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then - function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" } - function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') } - function battery_pct_prompt() { - b=$(battery_pct_remaining) + function battery_pct_remaining() { + if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then + echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" + fi + } + + function battery_time_remaining() { + if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then + echo $(acpi | cut -f3 -d ',') + fi + } + + function battery_pct_prompt() { + b=$(battery_pct_remaining) + if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then if [ $b -gt 50 ] ; then color='green' elif [ $b -gt 20 ] ; then @@ -65,11 +75,8 @@ elif [[ $(uname) == "Linux" ]] ; then color='red' fi echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" - } - else - error_msg='no battery' - function battery_pct_remaining() { echo $error_msg } - function battery_time_remaining() { echo $error_msg } - function battery_pct_prompt() { echo '' } - fi + else + echo "∞" + fi + } fi |