From 5e81b44e4b010f2e2a27a001b83a78264d8ad9e8 Mon Sep 17 00:00:00 2001
From: kenny <theozuang@gmail.com>
Date: Sun, 15 Jun 2025 18:05:26 +0300
Subject: [PATCH] Better battery prompt + added letters

---
 batterystatus.sh | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/batterystatus.sh b/batterystatus.sh
index 1c913b8..ca2b2f4 100755
--- a/batterystatus.sh
+++ b/batterystatus.sh
@@ -1,16 +1,33 @@
 #!/bin/sh
 
 while true; do
-  BATTERY=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep -E "state|to full|percentage" | awk -F': +' '
-        /state:/{s=$2}
-        /time to full:/{split($2,a,",");h=int(a[1])}
-        /percentage:/{gsub(",",".",$2);p=$2}
-        END{if(s=="charging") printf("%dh - %.2f%%\n",h,p)}
-    ')
-  DATE=$(date +'%Y-%m-%d %X')
-  VOLUME=$(echo "$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}') vol")
+  #BATTERY=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep -E "state|to full|percentage" | awk -F': +' '
+  #     /state:/{s=$2}
+  #    /time to full:/{split($2,a,",");h=int(a[1])}
+  #   /percentage:/{gsub(",",".",$2);p=$2}
+  #  END{if(s=="charging") printf("%dh - %.2f%%\n",h,p)}
+  #')
+  BATTERY=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | awk -F': +' '
+    /state:/{state=$2}
+    /time to full:/{time_full=$2}
+    /time to empty:/{time_empty=$2}
+    /percentage:/{gsub(",",".",$2); percentage=$2}
+    END{
+        if (state == "charging") {
+            printf("B-P: %s - %.2f%%\n", time_full, percentage);
+        } else if (state == "discharging") {
+            printf("B-U: %s - %.2f%%\n", time_empty, percentage);
+        } else {
+            printf("B: %s - %.2f%%\n", state, percentage);
+        }
+    }
+')
+  DISK=$(echo D:$(df -h / | awk 'NR==2 {print $5}'))
 
-  CPU=$(uptime | awk -F'load average:' '{ print $2 }' | awk '{ gsub(",", "", $1); gsub(",", "", $2); gsub(",", "", $3); print $1 " - " $2 " - " $3 }')
+  DATE=$(date +'%Y-%m-%d %X')
+  VOLUME=$(echo "V: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}')")
+
+  CPU=$(uptime | awk -F'load average:' '{ print $2 }' | awk '{ gsub(",", "", $1); gsub(",", "", $2); gsub(",", "", $3); print " L: " $1 " - " $2 " - " $3 }')
   echo "$CPU | $VOLUME | $BATTERY | $DATE"
   sleep 1
 done