Merge pull request #4572 from aioutecism/master

Avoid using "PREFIX" that cause nvm to complain about.
This commit is contained in:
Marc Cornellà 2016-04-06 12:03:20 +02:00
commit d310fac7f6

View file

@ -10,9 +10,9 @@ B=$fg_no_bold[blue]
RESET=$reset_color RESET=$reset_color
if [ "$USER" = "root" ]; then if [ "$USER" = "root" ]; then
PROMPTCOLOR="%{$R%}" PREFIX="-!-"; PROMPTCOLOR="%{$R%}" PROMPTPREFIX="-!-";
else else
PROMPTCOLOR="" PREFIX="---"; PROMPTCOLOR="" PROMPTPREFIX="---";
fi fi
local return_code="%(?..%{$R%}%? ↵%{$RESET%})" local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
@ -66,7 +66,7 @@ function custom_git_prompt() {
} }
# %B sets bold text # %B sets bold text
PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} ' PROMPT='%B$PROMPTPREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
RPS1="${return_code}" RPS1="${return_code}"
ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}"