mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-18 05:40:07 +00:00
Fix double expansion of prompt variables
This commit is contained in:
parent
ddc425a840
commit
769d82ce63
1 changed files with 5 additions and 5 deletions
|
@ -670,7 +670,7 @@ prompt_dir() {
|
||||||
break;
|
break;
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
local packageName=$(jq '.name' ${pkgFile} 2> /dev/null \
|
local packageName=$(jq '.name' ${pkgFile} 2> /dev/null \
|
||||||
|| node -e 'console.log(require(process.argv[1]).name);' ${pkgFile} 2>/dev/null \
|
|| node -e 'console.log(require(process.argv[1]).name);' ${pkgFile} 2>/dev/null \
|
||||||
|| cat "${pkgFile}" 2> /dev/null | grep -m 1 "\"name\"" | awk -F ':' '{print $2}' | awk -F '"' '{print $2}' 2>/dev/null \
|
|| cat "${pkgFile}" 2> /dev/null | grep -m 1 "\"name\"" | awk -F ':' '{print $2}' | awk -F '"' '{print $2}' 2>/dev/null \
|
||||||
|
@ -1299,8 +1299,8 @@ powerlevel9k_prepare_prompts() {
|
||||||
_P9K_TIMER_START=0xFFFFFFFF
|
_P9K_TIMER_START=0xFFFFFFFF
|
||||||
|
|
||||||
if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
|
if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
|
||||||
PROMPT="$(print_icon 'MULTILINE_FIRST_PROMPT_PREFIX')%f%b%k$(build_left_prompt)
|
PROMPT='$(print_icon 'MULTILINE_FIRST_PROMPT_PREFIX')%f%b%k$(build_left_prompt)
|
||||||
$(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')"
|
$(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')'
|
||||||
if [[ "$POWERLEVEL9K_RPROMPT_ON_NEWLINE" != true ]]; then
|
if [[ "$POWERLEVEL9K_RPROMPT_ON_NEWLINE" != true ]]; then
|
||||||
# The right prompt should be on the same line as the first line of the left
|
# The right prompt should be on the same line as the first line of the left
|
||||||
# prompt. To do so, there is just a quite ugly workaround: Before zsh draws
|
# prompt. To do so, there is just a quite ugly workaround: Before zsh draws
|
||||||
|
@ -1315,13 +1315,13 @@ $(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')"
|
||||||
RPROMPT_SUFFIX=''
|
RPROMPT_SUFFIX=''
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
PROMPT="%f%b%k$(build_left_prompt)"
|
PROMPT='%f%b%k$(build_left_prompt)'
|
||||||
RPROMPT_PREFIX=''
|
RPROMPT_PREFIX=''
|
||||||
RPROMPT_SUFFIX=''
|
RPROMPT_SUFFIX=''
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$POWERLEVEL9K_DISABLE_RPROMPT" != true ]]; then
|
if [[ "$POWERLEVEL9K_DISABLE_RPROMPT" != true ]]; then
|
||||||
RPROMPT="$RPROMPT_PREFIX%f%b%k$(build_right_prompt)%{$reset_color%}$RPROMPT_SUFFIX"
|
RPROMPT='$RPROMPT_PREFIX%f%b%k$(build_right_prompt)%{$reset_color%}$RPROMPT_SUFFIX'
|
||||||
fi
|
fi
|
||||||
NEWLINE='
|
NEWLINE='
|
||||||
'
|
'
|
||||||
|
|
Loading…
Reference in a new issue