7787d1da6e27f3e8fc6035254a5bd912c21893e6

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1641 from NeuralSandwich/master

Battery plugin updates

Diff

 1diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
 2index 0c7c9421fe34a777d43a234c2f8daf20979c9c81..66bf46d138d5f6cedf8991239f4e9e9273d52095 100644
 3--- a/plugins/battery/battery.plugin.zsh
 4+++ b/plugins/battery/battery.plugin.zsh
 5@@ -46,17 +46,27 @@ if [[ $(uname) == "Darwin" ]] ; then
 6       fi
 7       echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
 8     else
 9-      echo ""
10+      echo "∞"
11     fi
12   }
13 
14 elif [[ $(uname) == "Linux"  ]] ; then
15 
16-  if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
17-    function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
18-    function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
19-    function battery_pct_prompt() {
20-      b=$(battery_pct_remaining)
21+  function battery_pct_remaining() {
22+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
23+      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
24+    fi
25+  }
26+
27+  function battery_time_remaining() {
28+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
29+      echo $(acpi | cut -f3 -d ',')
30+    fi
31+  }
32+
33+  function battery_pct_prompt() {
34+    b=$(battery_pct_remaining) 
35+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
36       if [ $b -gt 50 ] ; then
37         color='green'
38       elif [ $b -gt 20 ] ; then
39@@ -65,11 +75,8 @@ elif [[ $(uname) == "Linux"  ]] ; then
40         color='red'
41       fi
42       echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
43-    }
44-  else
45-    error_msg='no battery'
46-    function battery_pct_remaining() { echo $error_msg }
47-    function battery_time_remaining() { echo $error_msg }
48-    function battery_pct_prompt() { echo '' }
49-  fi
50+    else
51+      echo "∞"
52+    fi
53+  }
54 fi