Fix tilde substitution in theme prompts

These themes used an adhoc substitution of $HOME for tilde
in $PWD, but it's better to use '%~' and is less error prone.

See #7160
This commit is contained in:
Marc Cornellà
2018-10-07 22:57:16 +02:00
parent ab9d92f665
commit 3a6fa9149b
5 changed files with 5 additions and 7 deletions

View File

@@ -30,11 +30,10 @@ if type rvm-prompt &>/dev/null; then
rvm_ruby='using%{$FG[243]%}$(rvm-prompt i v g)%{$reset_color%}'
fi
local current_dir='${PWD/#$HOME/~}'
local git_info='$(git_prompt_info)'
PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}${rvm_ruby} %D - %*
PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}${git_info} %{$FG[239]%}${rvm_ruby} %D - %*
╰─$(virtualenv_info)$(prompt_char) "
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"