Merge pull request #702 from nwinkler/battery-ac-osx

Added AC indicator support on OS X
pull/709/head
Nils Winkler 2016-04-15 08:30:06 +02:00
commit d25835fbb9
2 changed files with 11 additions and 11 deletions

View File

@ -2,15 +2,15 @@ cite about-plugin
about-plugin 'display info about your battery charge level'
ac_adapter_connected(){
if command_exists acpi;
then
acpi -a | grep "on-line"
if [[ "$?" -eq 0 ]]; then
return 1
else
return 0
fi
fi
if command_exists acpi;
then
acpi -a | grep -q "on-line"
return $?
elif command_exists ioreg;
then
ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = Yes'
return $?
fi
}
battery_percentage(){

View File

@ -35,7 +35,7 @@ LAST_STATUS_THEME_PROMPT_COLOR=196
CLOCK_THEME_PROMPT_COLOR=240
BATTERY_AC_CHAR="⚡"
BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
@ -153,7 +153,7 @@ function __powerline_battery_prompt {
else
color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
fi
[[ "$(ac_adapter_connected)" ]] && battery_status="${BATTERY_AC_CHAR}${battery_status}"
ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
echo "${battery_status}%|${color}"
fi
}