4eff7926b32b436c1a82a6306ce7d365ab7d622a

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #2648 from dfarrell07/master

Fixed which output at each new shell creation

Diff

 1diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
 2index f1057a9a974fafd033ea30a613d76295aefaaaa5..d383ed5830d168409c82c67b8b17c8be7fe1f538 100644
 3--- a/themes/gallois.zsh-theme
 4+++ b/themes/gallois.zsh-theme
 5@@ -11,19 +11,11 @@ git_custom_status() {
 6   fi
 7 }
 8 
 9-#RVM and git settings
10-if [[ -s ~/.rvm/scripts/rvm ]] ; then
11-  RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
12-else
13-  if which rbenv &> /dev/null; then
14-    RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
15-  else
16-    if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then
17-      RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
18-    else
19-      RPS1='$(git_custom_status) $EPS1'
20-    fi
21-  fi
22-fi
23+# RVM component of prompt
24+ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}["
25+ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}"
26+
27+# Combine it all into a final right-side prompt
28+RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
29 
30 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '