Merge pull request #1641 from NeuralSandwich/master

Battery plugin updates
This commit is contained in:
Robby Russell 2013-04-23 20:01:40 -07:00
commit 7787d1da6e

View File

@ -46,17 +46,27 @@ if [[ $(uname) == "Darwin" ]] ; then
fi fi
echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
else else
echo "" echo ""
fi fi
} }
elif [[ $(uname) == "Linux" ]] ; then elif [[ $(uname) == "Linux" ]] ; then
function battery_pct_remaining() {
if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" } echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')"
function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') } fi
}
function battery_time_remaining() {
if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
echo $(acpi | cut -f3 -d ',')
fi
}
function battery_pct_prompt() { function battery_pct_prompt() {
b=$(battery_pct_remaining) b=$(battery_pct_remaining)
if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
if [ $b -gt 50 ] ; then if [ $b -gt 50 ] ; then
color='green' color='green'
elif [ $b -gt 20 ] ; then elif [ $b -gt 20 ] ; then
@ -65,11 +75,8 @@ elif [[ $(uname) == "Linux" ]] ; then
color='red' color='red'
fi fi
echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
}
else else
error_msg='no battery' echo "∞"
function battery_pct_remaining() { echo $error_msg }
function battery_time_remaining() { echo $error_msg }
function battery_pct_prompt() { echo '' }
fi fi
}
fi fi