Merge pull request #1056 from julianaito/master

battery/OpenBSD: improved charge%, adds status

Merge pull request #1056 from julianaito/master
71df4ffd · Dylan Araps · GitHub · 22df76c3 · 13328742 · 71df4ffd
Unverified Commit 71df4ffd authored Jul 17, 2018 by Dylan Araps Committed by GitHub Jul 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

neofetch neofetch +11 -4

No files found.
--- a/neofetch
+++ b/neofetch
@@ -3176,12 +3176,19 @@ get_battery() {
                ;;

                "OpenBSD"* | "Bitrig"*)
-                    battery0full="$(sysctl -n hw.sensors.acpibat0.watthour0)"
-                    battery0full="${battery0full/ Wh*}"
+                    battery0full="$(sysctl -n   hw.sensors.acpibat0.watthour0\
+                                                hw.sensors.acpibat0.amphour0)"
+                    battery0full="${battery0full%% *}"

-                    battery0now="$(sysctl -n hw.sensors.acpibat0.watthour3)"
-                    battery0now="${battery0now/ Wh*}"
+                    battery0now="$(sysctl -n    hw.sensors.acpibat0.watthour3\
+                                                hw.sensors.acpibat0.amphour3)"
+                    battery0now="${battery0now%% *}"

+                    state="$(sysctl -n hw.sensors.acpibat0.raw0)"
+                    state="${state##? (battery }"
+                    state="${state%)*}"
+
+                    [[ "${state}" == "charging" ]] && battery_state="charging"
                    [[ "$battery0full" ]] && \
                    battery="$((100 * ${battery0now/\.} / ${battery0full/\.}))%"
                ;;