From 85a0e2cc809dfc455280042ce6ab64a86d295f0b Mon Sep 17 00:00:00 2001 From: dawidd6 Date: Sun, 20 Mar 2016 13:02:36 +0100 Subject: [PATCH 1/5] added power status for single battery --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index cfaea51b..a285e581 100755 --- a/neofetch +++ b/neofetch @@ -1551,7 +1551,8 @@ getbattery () { # Create an array of battery usage from each battery. batteries=($(cat /sys/class/power_supply/BAT${battery_num}/capacity)) - + # Get the power status + power_status=($(cat /sys/class/power_supply/BAT${battery_num}/status)) # Get the subtitle and reassign it so it doesn't change. title="$subtitle" @@ -1572,14 +1573,14 @@ getbattery () { "bar") prin "${title}${index}: $(bar ${bat/'%'} 100)" ;; "infobar") prin "${title}${index}: ${bat}% $(bar "${bat/'%'}" 100)" ;; "barinfo") prin "${title}${index}: $(bar "${bat/'%'}" 100) ${bat}%" ;; - *) prin "${title}${index}: ${bat}%" ;; + *) prin "${title}${index}: ${bat}% " ;; esac index=$((index + 1)) done return fi - battery="${batteries[0]}%" + battery="${batteries[0]}% ${power_status}" fi else battery="None" From 5bcaa342a8ef4639f95fecf2ee53577928f32e47 Mon Sep 17 00:00:00 2001 From: dawidd6 Date: Sun, 20 Mar 2016 15:06:28 +0100 Subject: [PATCH 2/5] fixed battery_status to show only charging status + added battery_status to FreeBSD --- neofetch | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a285e581..e4542966 100755 --- a/neofetch +++ b/neofetch @@ -1573,14 +1573,17 @@ getbattery () { "bar") prin "${title}${index}: $(bar ${bat/'%'} 100)" ;; "infobar") prin "${title}${index}: ${bat}% $(bar "${bat/'%'}" 100)" ;; "barinfo") prin "${title}${index}: $(bar "${bat/'%'}" 100) ${bat}%" ;; - *) prin "${title}${index}: ${bat}% " ;; + *) prin "${title}${index}: ${bat}%" ;; esac index=$((index + 1)) done return fi - - battery="${batteries[0]}% ${power_status}" + if [ $power_status = "Charging" ]; then + battery="${batteries[0]}% ${power_status}" + else + battery="${batteries[0]}%" + fi fi else battery="None" @@ -1590,7 +1593,13 @@ getbattery () { "BSD") case "$distro" in "FreeBSD"*) + power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}') + + if [ $power_status = "charging" ]; then + battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') $power_status" + else battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') + fi ;; "NetBSD"*) From 913e14a8ae224a72401134310e82e5f46ec2f8dd Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Mon, 21 Mar 2016 12:19:52 +1100 Subject: [PATCH 3/5] added OS X support, fixed capitalisation --- neofetch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e4542966..43a0aad8 100755 --- a/neofetch +++ b/neofetch @@ -1580,7 +1580,7 @@ getbattery () { return fi if [ $power_status = "Charging" ]; then - battery="${batteries[0]}% ${power_status}" + battery="${batteries[0]}% Charging" else battery="${batteries[0]}%" fi @@ -1596,7 +1596,7 @@ getbattery () { power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}') if [ $power_status = "charging" ]; then - battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') $power_status" + battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging" else battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') fi @@ -1621,6 +1621,10 @@ getbattery () { "Mac OS X") battery="$(pmset -g batt | grep -o '[0-9]*%')" + power_status="$(pmset -g batt | awk 'NR==2 {print $3}')" + if [ "$power_status" == "charging;" ]; then + battery="${battery} Charging" + fi ;; "Windows") From ef0dd5f0968450873f78f53cd97b6fec58504ece Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Mon, 21 Mar 2016 17:22:38 +1100 Subject: [PATCH 4/5] fixed with @dylanaraps suggestions from #1 --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 43a0aad8..aa63de68 100755 --- a/neofetch +++ b/neofetch @@ -1622,9 +1622,8 @@ getbattery () { "Mac OS X") battery="$(pmset -g batt | grep -o '[0-9]*%')" power_status="$(pmset -g batt | awk 'NR==2 {print $3}')" - if [ "$power_status" == "charging;" ]; then + [ "$power_status" == "charging;" ] && \ battery="${battery} Charging" - fi ;; "Windows") From 2c7696fdd05d545ec4e6409e60ace4840c201184 Mon Sep 17 00:00:00 2001 From: dawidd6 Date: Fri, 25 Mar 2016 13:50:49 +0100 Subject: [PATCH 5/5] cosmetical changes according to @dylanaraps suggestions --- neofetch | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index aa63de68..a5cb5ad5 100755 --- a/neofetch +++ b/neofetch @@ -1551,8 +1551,8 @@ getbattery () { # Create an array of battery usage from each battery. batteries=($(cat /sys/class/power_supply/BAT${battery_num}/capacity)) - # Get the power status - power_status=($(cat /sys/class/power_supply/BAT${battery_num}/status)) + # Get the power status + battery_status=($(cat /sys/class/power_supply/BAT${battery_num}/status)) # Get the subtitle and reassign it so it doesn't change. title="$subtitle" @@ -1579,11 +1579,12 @@ getbattery () { done return fi - if [ $power_status = "Charging" ]; then - battery="${batteries[0]}% Charging" - else - battery="${batteries[0]}%" - fi + + if [ "$battery_status" == "Charging" ]; then + battery="${batteries[0]}% Charging" + else + battery="${batteries[0]}%" + fi fi else battery="None" @@ -1593,12 +1594,12 @@ getbattery () { "BSD") case "$distro" in "FreeBSD"*) - power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}') - - if [ $power_status = "charging" ]; then - battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging" - else - battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') + battery_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}') + + if [ "$battery_status" == "charging" ]; then + battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging" + else + battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') fi ;; @@ -1621,8 +1622,8 @@ getbattery () { "Mac OS X") battery="$(pmset -g batt | grep -o '[0-9]*%')" - power_status="$(pmset -g batt | awk 'NR==2 {print $3}')" - [ "$power_status" == "charging;" ] && \ + battery_status="$(pmset -g batt | awk 'NR==2 {print $3}')" + [ "$battery_status" == "charging;" ] && \ battery="${battery} Charging" ;;