summaryrefslogtreecommitdiff
path: root/themes/amuse.zsh-theme
diff options
context:
space:
mode:
authorChris McCuller <cmcculler@salesforce.com>2015-09-21 22:19:15 -0400
committerChris McCuller <cmcculler@salesforce.com>2015-09-21 22:19:15 -0400
commite6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch)
treec12c8c2c6437fd7d5d3ec5bff27634a80759b808 /themes/amuse.zsh-theme
parent30ef85664822595e29acdbc840c45d5772d84b5d (diff)
parent76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff)
downloadzsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz
zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2
zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip
Merge master (rebase being super annoying). Fix conflicts
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
+