XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 5035b2d815 e5d50f0d97
commit d25835fbb9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/available/battery.plugin.bash
View File

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

4
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -35,7 +35,7 @@ LAST_STATUS_THEME_PROMPT_COLOR=196
CLOCK_THEME_PROMPT_COLOR=240 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_GOOD_COLOR=70
BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
@ -153,7 +153,7 @@ function __powerline_battery_prompt {
else else
color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}" color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
fi 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}" echo "${battery_status}%|${color}"
fi fi
} }