better method of getting battery percentage

jstat

@@ -45,21 +45,21 @@ while (true); do
     #mouse_state="$(upower -i /org/freedesktop/UPower/devices/battery_hidpp_battery_6 | grep state | awk '{print $2}')"
     battery_name=$(upower --dump | grep Device.*battery | awk '{print $2}')
     mouse_state="$(upower -i $battery_name | grep state | awk '{print $2}')"
+
     # get charge percentage
-    mouse_charge="$(upower -i $battery_name | grep percentage | awk '{print $2}')"
+    #mouse_charge="$(upower -i $battery_name | grep percentage | awk '{print $2}')"
+    mouse_charge=$(< /sys/class/power_supply/BAT0/capacity)
     # if the mouse is charging, set state to percentage.  otherwise dont show it ("")
-    #if [ $mouse_state == "charging" ] && [ $mouse_state != "discharging" ]; then
-   #     mouse_status="[ Mouse: $mouse_charge ]"
-   # else
-   #     unset mouse_status
-   # fi
+    if [ $mouse_state == "charging" ] && [ $mouse_state != "discharging" ]; then
+        mouse_status="$mouse_charge%+"
+    else
+        mouse_status="$mouse_charge%"
+    fi
 
     # volume up/down scripts will SIGHUP this PID
     # when you receive SIGHUP just run set_volume()
     trap set_volume SIGHUP
 
-
-
     ### weather stuff
     wttr_file="/tmp/weather"
     if [[ -s "$wttr_file" ]]; then
@@ -70,5 +70,8 @@ while (true); do
         xsetroot -name "$mouse_status $play $vol $timedate"
     fi
 
+    # final output to status bar
+    #xsetroot -name "$mouse_status $play $vol $timedate"
+    xsetroot -name "$mouse_status $timedate"
     sleep 0.5;
 done