mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Various syntax fixes and function naming equivalence
- Fix code style - Fix local definitions - Don't declare unnecessary variables - Use `command` before grep
This commit is contained in:
Marc Cornellà
parent
39e61614f2
commit
5f6f7b6e8d
1 changed files with 63 additions and 71 deletions
|
|
@ -11,22 +11,21 @@
|
||||||
# Modified to add support for FreeBSD #
|
# Modified to add support for FreeBSD #
|
||||||
###########################################
|
###########################################
|
||||||
|
|
||||||
if [[ "$OSTYPE" = darwin* ]] ; then
|
if [[ "$OSTYPE" = darwin* ]]; then
|
||||||
|
|
||||||
function battery_pct() {
|
function battery_is_charging() {
|
||||||
local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
|
ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
|
||||||
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))
|
|
||||||
echo $i
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function plugged_in() {
|
function battery_pct() {
|
||||||
[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
|
local smart_battery_status="$(ioreg -rc AppleSmartBattery)"
|
||||||
|
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"\ =\ //')
|
||||||
|
echo $(( (currentcapacity/maxcapacity) * 100 ))
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct_remaining() {
|
function battery_pct_remaining() {
|
||||||
if plugged_in ; then
|
if battery_is_charging; then
|
||||||
echo "External Power"
|
echo "External Power"
|
||||||
else
|
else
|
||||||
battery_pct
|
battery_pct
|
||||||
|
|
@ -35,9 +34,9 @@ if [[ "$OSTYPE" = darwin* ]] ; then
|
||||||
|
|
||||||
function battery_time_remaining() {
|
function battery_time_remaining() {
|
||||||
local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
|
local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
|
||||||
if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
|
if [[ $(echo $smart_battery_status | command grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]]; then
|
||||||
timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
|
timeremaining=$(echo $smart_battery_status | command grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
|
||||||
if [ $timeremaining -gt 720 ] ; then
|
if [ $timeremaining -gt 720 ]; then
|
||||||
echo "::"
|
echo "::"
|
||||||
else
|
else
|
||||||
echo "~$((timeremaining / 60)):$((timeremaining % 60))"
|
echo "~$((timeremaining / 60)):$((timeremaining % 60))"
|
||||||
|
|
@ -48,11 +47,11 @@ if [[ "$OSTYPE" = darwin* ]] ; then
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct_prompt () {
|
function battery_pct_prompt () {
|
||||||
if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
|
if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
|
||||||
b=$(battery_pct_remaining)
|
b=$(battery_pct_remaining)
|
||||||
if [ $b -gt 50 ] ; then
|
if [[ $b -gt 50 ]]; then
|
||||||
color='green'
|
color='green'
|
||||||
elif [ $b -gt 20 ] ; then
|
elif [[ $b -gt 20 ]]; then
|
||||||
color='yellow'
|
color='yellow'
|
||||||
else
|
else
|
||||||
color='red'
|
color='red'
|
||||||
|
|
@ -63,24 +62,20 @@ if [[ "$OSTYPE" = darwin* ]] ; then
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_is_charging() {
|
elif [[ "$OSTYPE" = freebsd* ]]; then
|
||||||
[[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
elif [[ "$OSTYPE" = freebsd* ]] ; then
|
|
||||||
|
|
||||||
function battery_is_charging() {
|
function battery_is_charging() {
|
||||||
[[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
|
[[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct() {
|
function battery_pct() {
|
||||||
if (( $+commands[sysctl] )) ; then
|
if (( $+commands[sysctl] )); then
|
||||||
echo "$(sysctl -n hw.acpi.battery.life)"
|
sysctl -n hw.acpi.battery.life
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct_remaining() {
|
function battery_pct_remaining() {
|
||||||
if [ ! $(battery_is_charging) ] ; then
|
if ! battery_is_charging; then
|
||||||
battery_pct
|
battery_pct
|
||||||
else
|
else
|
||||||
echo "External Power"
|
echo "External Power"
|
||||||
|
|
@ -88,39 +83,40 @@ elif [[ "$OSTYPE" = freebsd* ]] ; then
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_time_remaining() {
|
function battery_time_remaining() {
|
||||||
|
local remaining_time
|
||||||
remaining_time=$(sysctl -n hw.acpi.battery.time)
|
remaining_time=$(sysctl -n hw.acpi.battery.time)
|
||||||
if [[ $remaining_time -ge 0 ]] ; then
|
if [[ $remaining_time -ge 0 ]]; then
|
||||||
# calculation from https://www.unix.com/shell-programming-and-scripting/23695-convert-minutes-hours-minutes-seconds.html
|
((hour = $remaining_time / 60 ))
|
||||||
((hour=$remaining_time/60))
|
((minute = $remaining_time % 60 ))
|
||||||
((minute=$remaining_time-$hour*60))
|
printf %02d:%02d $hour $minute
|
||||||
echo $hour:$minute
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct_prompt() {
|
function battery_pct_prompt() {
|
||||||
|
local b color
|
||||||
b=$(battery_pct_remaining)
|
b=$(battery_pct_remaining)
|
||||||
if [ ! $(battery_is_charging) ] ; then
|
if battery_is_charging; then
|
||||||
if [ $b -gt 50 ] ; then
|
echo "∞"
|
||||||
|
else
|
||||||
|
if [[ $b -gt 50 ]]; then
|
||||||
color='green'
|
color='green'
|
||||||
elif [ $b -gt 20 ] ; then
|
elif [[ $b -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_remaining)%%%{$reset_color%}"
|
||||||
else
|
|
||||||
echo "∞"
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
elif [[ "$OSTYPE" = linux* ]] ; then
|
elif [[ "$OSTYPE" = linux* ]]; then
|
||||||
|
|
||||||
function battery_is_charging() {
|
function battery_is_charging() {
|
||||||
! acpi 2>/dev/null | command grep -q '^Battery.*Discharging'
|
! acpi 2>/dev/null | command grep -q '^Battery.*Discharging'
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct() {
|
function battery_pct() {
|
||||||
if (( $+commands[acpi] )) ; then
|
if (( $+commands[acpi] )); then
|
||||||
acpi 2>/dev/null | cut -f2 -d ',' | tr -cd '[:digit:]'
|
acpi 2>/dev/null | cut -f2 -d ',' | tr -cd '[:digit:]'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -140,13 +136,14 @@ elif [[ "$OSTYPE" = linux* ]] ; then
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_pct_prompt() {
|
function battery_pct_prompt() {
|
||||||
local b=$(battery_pct_remaining)
|
local b color
|
||||||
|
b=$(battery_pct_remaining)
|
||||||
if battery_is_charging; then
|
if battery_is_charging; then
|
||||||
echo "∞"
|
echo "∞"
|
||||||
else
|
else
|
||||||
if [[ $b -gt 50 ]]; then
|
if [[ $b -gt 50 ]]; then
|
||||||
color='green'
|
color='green'
|
||||||
elif [ $b -gt 20 ] ; then
|
elif [[ $b -gt 20 ]]; then
|
||||||
color='yellow'
|
color='yellow'
|
||||||
else
|
else
|
||||||
color='red'
|
color='red'
|
||||||
|
|
@ -157,53 +154,50 @@ elif [[ "$OSTYPE" = linux* ]] ; then
|
||||||
|
|
||||||
else
|
else
|
||||||
# Empty functions so we don't cause errors in prompts
|
# Empty functions so we don't cause errors in prompts
|
||||||
function battery_pct_remaining() {
|
function battery_is_charging { false }
|
||||||
}
|
function battery_pct \
|
||||||
|
battery_pct_remaining \
|
||||||
function battery_time_remaining() {
|
battery_time_remaining \
|
||||||
}
|
battery_pct_prompt { }
|
||||||
|
|
||||||
function battery_pct_prompt() {
|
|
||||||
}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function battery_level_gauge() {
|
function battery_level_gauge() {
|
||||||
local gauge_slots=${BATTERY_GAUGE_SLOTS:-10};
|
local gauge_slots=${BATTERY_GAUGE_SLOTS:-10}
|
||||||
local green_threshold=${BATTERY_GREEN_THRESHOLD:-$(( gauge_slots * 0.6 ))};
|
local green_threshold=${BATTERY_GREEN_THRESHOLD:-$(( gauge_slots * 0.6 ))}
|
||||||
local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-$(( gauge_slots * 0.4 ))};
|
local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-$(( gauge_slots * 0.4 ))}
|
||||||
local color_green=${BATTERY_COLOR_GREEN:-%F{green}};
|
local color_green=${BATTERY_COLOR_GREEN:-%F{green}}
|
||||||
local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}};
|
local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}}
|
||||||
local color_red=${BATTERY_COLOR_RED:-%F{red}};
|
local color_red=${BATTERY_COLOR_RED:-%F{red}}
|
||||||
local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}};
|
local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}}
|
||||||
local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['};
|
local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['}
|
||||||
local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'};
|
local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'}
|
||||||
local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'};
|
local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'}
|
||||||
local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'};
|
local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'}
|
||||||
local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow};
|
local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
|
||||||
local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'};
|
local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
|
||||||
|
|
||||||
local battery_remaining_percentage=$(battery_pct);
|
local battery_remaining_percentage=$(battery_pct)
|
||||||
local filled empty gauge_color
|
local filled empty gauge_color
|
||||||
|
|
||||||
if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
|
if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
|
||||||
filled=$(( ($battery_remaining_percentage * $gauge_slots) / 100 ));
|
filled=$(( ($battery_remaining_percentage * $gauge_slots) / 100 ))
|
||||||
empty=$(( $gauge_slots - $filled ));
|
empty=$(( $gauge_slots - $filled ))
|
||||||
|
|
||||||
if [[ $filled -gt $green_threshold ]]; then
|
if [[ $filled -gt $green_threshold ]]; then
|
||||||
gauge_color=$color_green;
|
gauge_color=$color_green
|
||||||
elif [[ $filled -gt $yellow_threshold ]]; then
|
elif [[ $filled -gt $yellow_threshold ]]; then
|
||||||
gauge_color=$color_yellow;
|
gauge_color=$color_yellow
|
||||||
else
|
else
|
||||||
gauge_color=$color_red;
|
gauge_color=$color_red
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
filled=$gauge_slots;
|
filled=$gauge_slots
|
||||||
empty=0;
|
empty=0
|
||||||
filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
|
filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local charging=' '
|
local charging=' '
|
||||||
battery_is_charging && charging=$charging_symbol;
|
battery_is_charging && charging=$charging_symbol
|
||||||
|
|
||||||
# Charging status and prefix
|
# Charging status and prefix
|
||||||
printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
|
printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
|
||||||
|
|
@ -214,5 +208,3 @@ function battery_level_gauge() {
|
||||||
# Suffix
|
# Suffix
|
||||||
printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
|
printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue