diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-17 09:32:57 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-17 09:32:57 -0400 |
| commit | 5a586670d73dbbda97d124e33398aabf21597659 (patch) | |
| tree | 770a29ab869a831afdeb2fd0096e9af0b4af6c61 /plugins/battery | |
| parent | 223fd60ba597b8c23569c65878d766c3c933fa70 (diff) | |
| parent | ca900216302aa1138c793971cf877b5d4e88fb06 (diff) | |
| download | zsh-5a586670d73dbbda97d124e33398aabf21597659.tar.gz zsh-5a586670d73dbbda97d124e33398aabf21597659.tar.bz2 zsh-5a586670d73dbbda97d124e33398aabf21597659.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/battery')
| -rw-r--r-- | plugins/battery/battery.plugin.zsh | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index e39cc5b8f..b16a75c5b 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -34,7 +34,11 @@ if [[ $(uname) == "Darwin" ]] ; then local smart_battery_status="$(ioreg -rc "AppleSmartBattery")" if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //') - echo "~$((timeremaining / 60)):$((timeremaining % 60))" + if [ $timeremaining -gt 720 ] ; then + echo "::" + else + echo "~$((timeremaining / 60)):$((timeremaining % 60))" + fi else echo "∞" fi @@ -62,9 +66,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 +104,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() { |