summaryrefslogtreecommitdiff
path: root/themes/amuse.zsh-theme
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-23 18:53:05 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-23 18:53:05 -0400
commit96ff86142e9037e707f9cde8ab69e0425a0559c6 (patch)
tree217cb5e2b4a1c55afec79984c3c3c0a9efe2bf69 /themes/amuse.zsh-theme
parent502f08b5e19716d43a7ec8b006178a7b017f68cd (diff)
parent76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff)
downloadzsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.gz
zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.bz2
zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.zip
Merge branch 'master' into installer-cygwin-support-3
Conflicts: tools/install.sh
Diffstat (limited to 'themes/amuse.zsh-theme')
-rw-r--r--themes/amuse.zsh-theme9
1 files changed, 8 insertions, 1 deletions
diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
index 548f6d39d..60761b5c0 100644
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
@@ -18,4 +18,11 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
ZSH_THEME_GIT_PROMPT_CLEAN=""
-RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
+ RPROMPT='%{$fg_bold[red]%}‹$(~/.rvm/bin/rvm-prompt i v)›%{$reset_color%}'
+else
+ if which rbenv &> /dev/null; then
+ RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+ fi
+fi
+