diff options
| author | Robby Russell <robby@planetargon.com> | 2014-11-06 09:19:20 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-11-06 09:19:20 -0800 |
| commit | 4eff7926b32b436c1a82a6306ce7d365ab7d622a (patch) | |
| tree | b4104cf7cd5ebf47a3281a1b26a8264513a9ee25 /themes/gallois.zsh-theme | |
| parent | 160abc9a8d49fcc8b334a88d9b877f3ee3935229 (diff) | |
| parent | b2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa (diff) | |
| download | zsh-4eff7926b32b436c1a82a6306ce7d365ab7d622a.tar.gz zsh-4eff7926b32b436c1a82a6306ce7d365ab7d622a.tar.bz2 zsh-4eff7926b32b436c1a82a6306ce7d365ab7d622a.zip | |
Merge pull request #2648 from dfarrell07/master
Fixed which output at each new shell creation
Diffstat (limited to 'themes/gallois.zsh-theme')
| -rw-r--r-- | themes/gallois.zsh-theme | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index f1057a9a9..d383ed583 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -11,19 +11,11 @@ git_custom_status() { fi } -#RVM and git settings -if [[ -s ~/.rvm/scripts/rvm ]] ; then - RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1' -else - if which rbenv &> /dev/null; then - RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $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 +# RVM component of prompt +ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}[" +ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}" + +# Combine it all into a final right-side prompt +RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1' PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b ' |