Merge pull request #1 from iandrewt/battery_status_mac

Battery status for mac
This commit is contained in:
Dawid 2016-03-21 06:43:47 +01:00
commit 49795c5035
2 changed files with 18 additions and 2 deletions

12
1.6.md
View file

@ -1 +1,13 @@
# Neofetch 1.6 # Neofetch 1.6
### Contributers
Thanks to the following people for contributing this release.
- **[@dawidd6](https://github.com/dawidd6)**
- **[@onodera-punpun](https://github.com/onodera-punpun)**
### Info
**OS**<br \>
- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)**

View file

@ -1580,7 +1580,7 @@ getbattery () {
return return
fi fi
if [ $power_status = "Charging" ]; then if [ $power_status = "Charging" ]; then
battery="${batteries[0]}% ${power_status}" battery="${batteries[0]}% Charging"
else else
battery="${batteries[0]}%" battery="${batteries[0]}%"
fi fi
@ -1596,7 +1596,7 @@ getbattery () {
power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}') power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')
if [ $power_status = "charging" ]; then 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 else
battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
fi fi
@ -1621,6 +1621,10 @@ getbattery () {
"Mac OS X") "Mac OS X")
battery="$(pmset -g batt | grep -o '[0-9]*%')" 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") "Windows")