1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-22 13:50:09 +00:00

Merge pull request #2648 from dfarrell07/master

Fixed which output at each new shell creation
This commit is contained in:
Robby Russell 2014-11-06 09:19:20 -08:00
commit 4eff7926b3

View file

@ -11,19 +11,11 @@ git_custom_status() {
fi fi
} }
#RVM and git settings # RVM component of prompt
if [[ -s ~/.rvm/scripts/rvm ]] ; then ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}["
RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1' ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}"
else
if which rbenv &> /dev/null; then # Combine it all into a final right-side prompt
RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1' RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
else
if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then
RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
else
RPS1='$(git_custom_status) $EPS1'
fi
fi
fi
PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b ' PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '