stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify % escape for zsh

Browse Source
This commit is contained in:
Olivier Mengué 2014-07-01 00:07:06 +02:00
parent ee6343567d
commit d5ac06e711
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
liquidprompt
View File

@ -72,6 +72,7 @@ if test -n "$BASH_VERSION" -a -n "$PS1" ; then
_LP_MARK_SYMBOL='\$' _LP_MARK_SYMBOL='\$'
_LP_FIRST_INDEX=0 _LP_FIRST_INDEX=0
_LP_PWD_SYMBOL="\\w" _LP_PWD_SYMBOL="\\w"
_LP_PERCENT='%' # percent must be escaped on zsh
# Disable the DEBUG trap used by the RUNTIME feature # Disable the DEBUG trap used by the RUNTIME feature
# (in case we are reloading LP in the same shell after disabling # (in case we are reloading LP in the same shell after disabling
# the feature in .liquidpromptrc) # the feature in .liquidpromptrc)
@ -87,6 +88,7 @@ elif test -n "$ZSH_VERSION" ; then
_LP_TIME_SYMBOL="%*" _LP_TIME_SYMBOL="%*"
_LP_MARK_SYMBOL='%(!.#.%%)' _LP_MARK_SYMBOL='%(!.#.%%)'
_LP_FIRST_INDEX=1 _LP_FIRST_INDEX=1
_LP_PERCENT='%%'
_LP_PWD_SYMBOL="%~" _LP_PWD_SYMBOL="%~"
else else
echo "liquidprompt: shell not supported" >&2 echo "liquidprompt: shell not supported" >&2
@ -1247,11 +1249,7 @@ _lp_battery_color()
ret="${ret}${LP_COLORMAP_0}" ret="${ret}${LP_COLORMAP_0}"
fi fi
if $_LP_SHELL_bash; then ret="${ret}${bat}$_LP_PERCENT"
ret="${ret}${bat}%"
else # zsh
ret="${ret}${bat}%%"
fi
fi # LP_PERCENTS_ALWAYS fi # LP_PERCENTS_ALWAYS
echo -ne "${ret}${NO_COL}" echo -ne "${ret}${NO_COL}"
fi # ret fi # ret
@ -1360,11 +1358,7 @@ _lp_load_color()
local ret="$(_lp_color_map $load 200)${LP_MARK_LOAD}" local ret="$(_lp_color_map $load 200)${LP_MARK_LOAD}"
if [[ "$LP_PERCENTS_ALWAYS" == 1 ]]; then if [[ "$LP_PERCENTS_ALWAYS" == 1 ]]; then
if $_LP_SHELL_bash; then ret="${ret}${load}${_LP_PERCENT}"
ret="${ret}$load%"
else # zsh
ret="${ret}$load%%"
fi
fi fi
echo -nE "${ret}${NO_COL}" echo -nE "${ret}${NO_COL}"
fi fi