Merge pull request #2620 from reedriley/master

Fixed errors if acpitool isn't installed on linux
This commit is contained in:
Robby Russell 2014-03-22 13:27:28 -07:00
commit e0e4c0eeaf

View file

@ -71,7 +71,9 @@ elif [[ $(uname) == "Linux" ]] ; then
} }
function battery_pct() { function battery_pct() {
if (( $+commands[acpi] )) ; then
echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')"
fi
} }
function battery_pct_remaining() { function battery_pct_remaining() {
@ -147,7 +149,6 @@ function battery_level_gauge() {
filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'}; filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
fi fi
local charging=' ' && battery_is_charging && charging=$charging_symbol; local charging=' ' && battery_is_charging && charging=$charging_symbol;
printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%} printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}