From 98f13c7b6a4370a6e26ea20ea3c3931c5a28da3f Mon Sep 17 00:00:00 2001 From: shine Date: Sun, 11 Jun 2017 14:33:22 +0530 Subject: [PATCH] Support upower for battery plugin --- plugins/available/battery.plugin.bash | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/plugins/available/battery.plugin.bash b/plugins/available/battery.plugin.bash index e4cee35d..20fa378e 100644 --- a/plugins/available/battery.plugin.bash +++ b/plugins/available/battery.plugin.bash @@ -2,7 +2,11 @@ cite about-plugin about-plugin 'display info about your battery charge level' ac_adapter_connected(){ - if command_exists acpi; + if command_exists upower; + then + upower --show-info $(upower --enumerate | grep BAT) | grep --quiet state | grep --quiet charging + return $? + elif command_exists acpi; then acpi -a | grep -q "on-line" return $? @@ -18,7 +22,11 @@ ac_adapter_connected(){ } ac_adapter_disconnected(){ - if command_exists acpi; + if command_exists upower; + then + upower --show-info $(upower --enumerate | grep BAT) | grep --quiet state | grep --quiet discharging + return $? + elif command_exists acpi; then acpi -a | grep -q "off-line" return $? @@ -37,7 +45,18 @@ battery_percentage(){ about 'displays battery charge as a percentage of full (100%)' group 'battery' - if command_exists acpi; + if command_exists upower; + then + local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage) + case UPOWER_OUTPUT in + 100*) + echo '100' + ;; + *) + echo $UPOWER_OUTPUT | tail --bytes 4 | head --bytes 2 + ;; + esac + elif command_exists acpi; then local ACPI_OUTPUT=$(acpi -b) case $ACPI_OUTPUT in