linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

battery: fix floating point output in macOS

Browse source 
Fixes #8676
This commit is contained in:
Marc Cornellà 2020-02-25 11:54:52 +01:00
parent 0e57142729
commit 7290a08bf6
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
plugins/battery/battery.plugin.zsh
View file

@ -21,7 +21,8 @@ if [[ "$OSTYPE" = darwin* ]]; then
local smart_battery_status="$(ioreg -rc AppleSmartBattery)" local smart_battery_status="$(ioreg -rc AppleSmartBattery)"
local -F maxcapacity=$(command grep '^.*"MaxCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*"MaxCapacity"\ =\ //') local -F maxcapacity=$(command grep '^.*"MaxCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*"MaxCapacity"\ =\ //')
local -F currentcapacity=$(command grep '^.*"CurrentCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*CurrentCapacity"\ =\ //') local -F currentcapacity=$(command grep '^.*"CurrentCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*CurrentCapacity"\ =\ //')
echo $(( (currentcapacity/maxcapacity) * 100 )) local -i pct=$(( (currentcapacity/maxcapacity) * 100 ))
echo $pct
} }
function battery_pct_remaining() { function battery_pct_remaining() {
@ -47,16 +48,17 @@ if [[ "$OSTYPE" = darwin* ]]; then
} }
function battery_pct_prompt () { function battery_pct_prompt () {
local battery_pct color
if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
b=$(battery_pct_remaining) battery_pct=$(battery_pct_remaining)
if [[ $b -gt 50 ]]; then if [[ $battery_pct -gt 50 ]]; then
color='green' color='green'
elif [[ $b -gt 20 ]]; then elif [[ $battery_pct -gt 20 ]]; then
color='yellow' color='yellow'
else else
color='red' color='red'
fi fi
echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" echo "%{$fg[$color]%}[${battery_pct}%%]%{$reset_color%}"
else else
echo "∞" echo "∞"
fi fi
@ -93,19 +95,19 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
} }
function battery_pct_prompt() { function battery_pct_prompt() {
local b color local battery_pct color
b=$(battery_pct_remaining) battery_pct=$(battery_pct_remaining)
if battery_is_charging; then if battery_is_charging; then
echo "∞" echo "∞"
else else
if [[ $b -gt 50 ]]; then if [[ $battery_pct -gt 50 ]]; then
color='green' color='green'
elif [[ $b -gt 20 ]]; then elif [[ $battery_pct -gt 20 ]]; then
color='yellow' color='yellow'
else else
color='red' color='red'
fi fi
echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}" echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
fi fi
} }
@ -136,19 +138,19 @@ elif [[ "$OSTYPE" = linux* ]]; then
} }
function battery_pct_prompt() { function battery_pct_prompt() {
local b color local battery_pct color
b=$(battery_pct_remaining) battery_pct=$(battery_pct_remaining)
if battery_is_charging; then if battery_is_charging; then
echo "∞" echo "∞"
else else
if [[ $b -gt 50 ]]; then if [[ $battery_pct -gt 50 ]]; then
color='green' color='green'
elif [[ $b -gt 20 ]]; then elif [[ $battery_pct -gt 20 ]]; then
color='yellow' color='yellow'
else else
color='red' color='red'
fi fi
echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}" echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
fi fi
} }