linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-10 04:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changed scope of $b, $timeremaining and $color to local

Browse source
This commit is contained in:
Michael Wolman 2016-01-15 20:22:17 -05:00
commit 6a26f0487f
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ if [[ "$OSTYPE" = darwin* ]] ; then
local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
typeset -F maxcapacity=$(echo $smart_battery_status | grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
typeset -F currentcapacity=$(echo $smart_battery_status | grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
integer i=$(((currentcapacity/maxcapacity) * 100))
local integer i=$(((currentcapacity/maxcapacity) * 100))
echo $i
}
@ -33,7 +33,7 @@ if [[ "$OSTYPE" = darwin* ]] ; then
function battery_time_remaining() {
local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
local timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
if [ $timeremaining -gt 720 ] ; then
echo "::"
else
@ -46,13 +46,13 @@ if [[ "$OSTYPE" = darwin* ]] ; then
function battery_pct_prompt () {
if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
b=$(battery_pct_remaining)
local b=$(battery_pct_remaining)
if [ $b -gt 50 ] ; then
color='green'
local color='green'
elif [ $b -gt 20 ] ; then
color='yellow'
local color='yellow'
else
color='red'
local color='red'
fi
echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
else
@ -91,14 +91,14 @@ elif [[ $(uname) == "Linux" ]] ; then
}
function battery_pct_prompt() {
b=$(battery_pct_remaining)
local b=$(battery_pct_remaining)
if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
if [ $b -gt 50 ] ; then
color='green'
local color='green'
elif [ $b -gt 20 ] ; then
color='yellow'
local color='yellow'
else
color='red'
local color='red'
fi
echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
else