Merge pull request #1776 from ronshapiro/master

plugged_in function
2014-03-13 07:41:18 -07:00 · 2014-03-13 07:41:18 -07:00 · e8b85f9202
commit e8b85f9202
parent a5df4d79c7 ae1973de44
1 changed files with 7 additions and 3 deletions
--- 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
  }