fdd46d8815f9c3a314e13d2dbb57685fd78f4e7c
- Author
- Sean Jones <neuralsandwich@gmail.com>
- Committer
- Sean Jones <neuralsandwich@gmail.com>
- Date
Message
Updated battery plugin. Displays charging time.
linux battery level now refreshes after every command
Diff
1diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
2index 95f8906321a948c4d0228c6ba0f580cd67556d73..cc9342c771d8e8d38767015cea3810fdf9f1f035 100644
3--- a/plugins/battery/battery.plugin.zsh
4+++ b/plugins/battery/battery.plugin.zsh
5@@ -42,17 +42,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@@ -61,11 +71,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