mittags sprint

modules/battery

@@ -1,31 +1,47 @@
 #!/bin/bash
 
-[[ ${BLOCK_INSTANCE} == '' ]] && BAT=0 || BAT=${BLOCK_INSTANCE}
-DIR="/sys/class/power_supply/BAT"
-if [ ! -f "${DIR}${BAT}/uevent" ]; then
-    echo " not found "
+DIR="/sys/class/power_supply"
+
+if [[ "$BLOCK_INSTANCE" == "" ]]; then
+    for BAT in $DIR/BAT*/; do
+        [[ -f "${BAT}uevent" ]] && BATS+="$BAT/uevent "
+    done
+else
+    [[ -f "$DIR/BAT$BLOCK_INSTANCE/uevent" ]] && BATS="$DIR/BAT$BLOCK_INSTANCE/uevent"    
+fi
+
+if [[ "${BATS}" == "" ]]; then
+    echo " no battery "
     echo "n/a"
     exit 33
 fi
-cat /sys/class/power_supply/BAT${BAT}/uevent | gawk -F '=' '
+
+cat $BATS | gawk -F '=' '
+    BEGIN {
+        efull = 0
+        enow = 0
+        status = ""
+    } 
     /POWER_SUPPLY_STATUS=/ {
-        status=$2
+        if (status == "") {
+            status = $2
+            if (status == "Discharging") {
+                status = "↓"
+            } else if (status == "Charging") {
+                status = "⚡"
+            } else {
+                status = ""
+            }
+        }
     }
     /POWER_SUPPLY_ENERGY_FULL=/ {
-        efull=$2
+        efull += $2
     }
     /POWER_SUPPLY_ENERGY_NOW=/ {
-        enow=$2
+        enow += $2
     }
     END {
-        charge=enow/efull*100
-        if (status == "Discharging") {
-            status="↓"
-        } else if (status == "Charging") {
-            status="↑"
-        } else {
-            status=""
-        }
+        charge = enow / efull * 100
         printf("%s%d%\n", status, charge)
         printf("%s%d\n", status, charge)
         if (charge > 25) {