From 320e864f591c3ae6c6c0a4a4783e5c4a875e7765 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 24 Mar 2016 16:34:32 +0000 Subject: [PATCH] Fix battery plugin Clean cases and remove spaces and % symbol in one awk command --- plugins/available/battery.plugin.bash | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/plugins/available/battery.plugin.bash b/plugins/available/battery.plugin.bash index 75741c4a..826b9b15 100644 --- a/plugins/available/battery.plugin.bash +++ b/plugins/available/battery.plugin.bash @@ -32,30 +32,13 @@ battery_percentage(){ ;; esac ;; - *" Discharging"*) - local PERC_OUTPUT=$(echo $ACPI_OUTPUT | head -c 26 | tail -c 2) - case $PERC_OUTPUT in - *%) - echo "0${PERC_OUTPUT}" | head -c 2 - ;; - *) - echo ${PERC_OUTPUT} - ;; - esac - ;; - *" Charging"*) - local PERC_OUTPUT=$(echo $ACPI_OUTPUT | head -c 23 | tail -c 2) - case $PERC_OUTPUT in - *%) - echo "0${PERC_OUTPUT}" | head -c 2 - ;; - *) - echo ${PERC_OUTPUT} - ;; - esac + + *" Charging"* | *" Discharging"*) + local PERC_OUTPUT=$(echo $ACPI_OUTPUT | awk -F, '/,/{gsub(/ /, "", $0); gsub(/%/,"", $0); print $2}' ) + echo ${PERC_OUTPUT} ;; *" Full"*) - echo '99' + echo '100' ;; *) echo '-1'