From a9c5670c2cf0e67324cbd83a37f73da772f6aecf Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Tue, 12 Apr 2016 09:54:03 +0200 Subject: [PATCH] Added AC indicator support on OS X Not sure about the logic for returning 1/0 from the function, though - will have to clarify. --- plugins/available/battery.plugin.bash | 24 ++++++++++++------- .../powerline-multiline.theme.bash | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/plugins/available/battery.plugin.bash b/plugins/available/battery.plugin.bash index 85af5097..9646b0e7 100644 --- a/plugins/available/battery.plugin.bash +++ b/plugins/available/battery.plugin.bash @@ -2,15 +2,23 @@ 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 + if command_exists acpi; + then + acpi -a | grep "on-line" + if [[ "$?" -eq 0 ]]; then + return 1 + else + return 0 fi + elif command_exists ioreg; + then + local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | grep '"ExternalConnected"' | awk -F'=' '{print $2}') + if [[ "$IOREG_OUTPUT" == *"Yes"* ]]; then + return 0 + else + return 1 + fi + fi } battery_percentage(){ diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash index 27d51d52..68f7858c 100644 --- a/themes/powerline-multiline/powerline-multiline.theme.bash +++ b/themes/powerline-multiline/powerline-multiline.theme.bash @@ -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 }