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

more efficient path parsing

Browse Source 
* no call to sed
* use of the "\w" for bash default value when path shorting is desactivated
This commit is contained in:
François Schmidts 2013-01-09 13:16:45 +01:00
parent 947781bac9
commit ea5d844819
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
liquidprompt
View File

@ -399,7 +399,11 @@ _lp_proxy()
_lp_shorten_path() _lp_shorten_path()
{ {
if [[ "$LP_ENABLE_SHORTEN_PATH" != 1 ]] ; then if [[ "$LP_ENABLE_SHORTEN_PATH" != 1 ]] ; then
echo "$1" if [[ "$_LP_WORKING_SHELL" == "bash" ]]; then
echo "\\w"
else
echo "$(print -P "%~")"
fi
return return
fi fi
# the character that will replace the part of the path that is masked # the character that will replace the part of the path that is masked
@ -410,17 +414,10 @@ _lp_shorten_path()
keep=$LP_PATH_KEEP keep=$LP_PATH_KEEP
fi fi
local len_percent=$2 local p="${PWD/$HOME/~}"
local p
if [[ "$_LP_WORKING_SHELL" == "bash" ]]; then
p=$(echo "$1" | sed -e "s|$HOME|~|")
elif [[ "$_LP_WORKING_SHELL" == "zsh" ]]; then
p=$1
fi
local len="${#p}" local len="${#p}"
local max_len=$((${COLUMNS:-80}*$len_percent/100)) local max_len=$((${COLUMNS:-80}*$LP_PATH_LENGTH/100))
local mask_len="${#mask}" local mask_len="${#mask}"
local slashes=0 local slashes=0
@ -993,11 +990,7 @@ _lp_set_prompt()
LP_USER=$(_lp_user) LP_USER=$(_lp_user)
# LP_HOST is a global set at load time # LP_HOST is a global set at load time
LP_PERM=$(_lp_permissions_color) LP_PERM=$(_lp_permissions_color)
if [[ "$_LP_WORKING_SHELL" == "bash" ]]; then LP_PWD=$(_lp_shorten_path)
LP_PWD=$(_lp_shorten_path "$PWD" $LP_PATH_LENGTH)
elif [[ "$_LP_WORKING_SHELL" == "zsh" ]]; then
LP_PWD=$(_lp_shorten_path "$(print -P "%~")" $LP_PATH_LENGTH)
fi
LP_PROXY="${LP_COLOR_PROXY}$(_lp_proxy)${NO_COL}" LP_PROXY="${LP_COLOR_PROXY}$(_lp_proxy)${NO_COL}"
# right of main prompt: space at left # right of main prompt: space at left