From 845a76504b47142a40daaa7999745429d80bed4a Mon Sep 17 00:00:00 2001 From: Tudor Date: Tue, 23 Feb 2016 11:21:16 +0200 Subject: [PATCH 1/4] Battery support for OpenBSD --- fetch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fetch b/fetch index f2aa2b35..551090e6 100755 --- a/fetch +++ b/fetch @@ -1397,11 +1397,19 @@ getbattery () { fi ;; - "BSD") + *"BSD") case "$distro" in "FreeBSD"*) battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') ;; + "OpenBSD") + battery0full=$(sysctl -n hw.sensors.acpibat0.watthour0) + battery0full=${battery0full/ Wh*} + + battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) + battery0now="${battery0now/ Wh*}" + + battery="$(( 100 * $battery0now / $battery0full ))%" esac ;; From cfa2df540c5d3aa8f9c4ff9839195934207a9d08 Mon Sep 17 00:00:00 2001 From: Tudor Date: Tue, 23 Feb 2016 11:24:38 +0200 Subject: [PATCH 2/4] OpenBSD is a pretty strange OS --- fetch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/fetch b/fetch index 551090e6..e752b12e 100755 --- a/fetch +++ b/fetch @@ -1397,22 +1397,24 @@ getbattery () { fi ;; - *"BSD") + "BSD") case "$distro" in "FreeBSD"*) battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') ;; - "OpenBSD") - battery0full=$(sysctl -n hw.sensors.acpibat0.watthour0) - battery0full=${battery0full/ Wh*} - - battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) - battery0now="${battery0now/ Wh*}" - - battery="$(( 100 * $battery0now / $battery0full ))%" esac ;; + "OpenBSD") + battery0full=$(sysctl -n hw.sensors.acpibat0.watthour0) + battery0full=${battery0full/ Wh*} + + battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) + battery0now="${battery0now/ Wh*}" + + battery="$(( 100 * $battery0now / $battery0full ))%" + ;; + "Mac OS X") battery="$(pmset -g batt | grep -o '[0-9]*%')" ;; From 28d33f752676608d452590361a37b29cb3048955 Mon Sep 17 00:00:00 2001 From: Tudor Date: Tue, 23 Feb 2016 11:29:03 +0200 Subject: [PATCH 3/4] It should work now --- fetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fetch b/fetch index e752b12e..c560ac77 100755 --- a/fetch +++ b/fetch @@ -1412,7 +1412,7 @@ getbattery () { battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) battery0now="${battery0now/ Wh*}" - battery="$(( 100 * $battery0now / $battery0full ))%" + battery="$(echo "100 * $battery0now / $battery0full" | bc)%" ;; "Mac OS X") From 0a7c21d6e4c914a0c58b7b7dbef84da95652b76f Mon Sep 17 00:00:00 2001 From: Tudor Date: Tue, 23 Feb 2016 11:39:09 +0200 Subject: [PATCH 4/4] Fixed indentation --- fetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fetch b/fetch index c560ac77..bb7da80f 100755 --- a/fetch +++ b/fetch @@ -1406,13 +1406,13 @@ getbattery () { ;; "OpenBSD") - battery0full=$(sysctl -n hw.sensors.acpibat0.watthour0) - battery0full=${battery0full/ Wh*} + battery0full=$(sysctl -n hw.sensors.acpibat0.watthour0) + battery0full=${battery0full/ Wh*} - battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) - battery0now="${battery0now/ Wh*}" + battery0now=$(sysctl -n hw.sensors.acpibat0.watthour3) + battery0now="${battery0now/ Wh*}" - battery="$(echo "100 * $battery0now / $battery0full" | bc)%" + battery="$(echo "100 * $battery0now / $battery0full" | bc)%" ;; "Mac OS X")