diff options
| author | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 |
|---|---|---|
| committer | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 |
| commit | bf4d4db72b065bff57d75355f49192175364b8a5 (patch) | |
| tree | 4ffa98f99c0919fda9418693d049a4bf7bf290f2 /plugins/battery | |
| parent | 8f7971349b653706071bc41e2fdb953bb6f22678 (diff) | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| download | zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.gz zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.bz2 zsh-bf4d4db72b065bff57d75355f49192175364b8a5.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Diffstat (limited to 'plugins/battery')
| -rw-r--r-- | plugins/battery/battery.plugin.zsh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 16ad3e651..e39cc5b8f 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -17,12 +17,16 @@ if [[ $(uname) == "Darwin" ]] ; then integer i=$(((currentcapacity/maxcapacity) * 100)) echo $i } + + function plugged_in() { + [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ] + } function battery_pct_remaining() { - if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then - battery_pct - else + if plugged_in ; then echo "External Power" + else + battery_pct fi } |