XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidated cases for pmset and ioreg

pull/1080/head
Nils Winkler 2017-10-23 17:21:24 +02:00
parent 486c9e1382
commit 6b97283cbf
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/available/battery.plugin.bash
View File

@ -64,32 +64,12 @@ battery_percentage(){
echo ${PERC_OUTPUT:--1} echo ${PERC_OUTPUT:--1}
elif _command_exists pmset; elif _command_exists pmset;
then then
local PMSET_OUTPUT=$(pmset -g ps | sed -n 's/.*[[:blank:]]+*\(.*%\).*/\1/p') local PMSET_OUTPUT=$(pmset -g ps | sed -n 's/.*[[:blank:]]+*\(.*%\).*/\1/p' | grep -o "[0-9]\+" | head -1)
case $PMSET_OUTPUT in echo ${PMSET_OUTPUT:--1}
100*)
echo '100'
;;
*)
# This will cut off any decimals, and will get rid of the optional percentage sign at the end, too.
# Works for:
# - 100%
# - 100.0%
# - 99.8%
# - 4%
echo $PMSET_OUTPUT | grep -o "[0-9]\+" | head -1
;;
esac
elif _command_exists ioreg; elif _command_exists ioreg;
then then
local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | awk '$1~/Capacity/{c[$1]=$3} END{OFMT="%05.2f%%"; max=c["\"MaxCapacity\""]; print (max>0? 100*c["\"CurrentCapacity\""]/max: "?")}') local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | awk '$1~/Capacity/{c[$1]=$3} END{OFMT="%05.2f%%"; max=c["\"MaxCapacity\""]; print (max>0? 100*c["\"CurrentCapacity\""]/max: "?")}' | grep -o "[0-9]\+" | head -1)
case $IOREG_OUTPUT in echo ${IOREG_OUTPUT:--1}
100*)
echo '100'
;;
*)
echo $IOREG_OUTPUT | head -c 2
;;
esac
elif _command_exists WMIC; elif _command_exists WMIC;
then then
local WINPC=$(echo porcent=$(WMIC PATH Win32_Battery Get EstimatedChargeRemaining /Format:List) | grep -o '[0-9]*') local WINPC=$(echo porcent=$(WMIC PATH Win32_Battery Get EstimatedChargeRemaining /Format:List) | grep -o '[0-9]*')