summaryrefslogtreecommitdiff
path: root/themes/nebirhos.zsh-theme
diff options
context:
space:
mode:
authorSébastien M-B <essembeh@gmail.com>2012-04-12 19:28:59 +0200
committerSébastien M-B <essembeh@gmail.com>2012-04-12 19:28:59 +0200
commit741388be00fb88b7680e0faa328adf5a86e1f65f (patch)
tree5e53a65fcc71bc01c5f81b28fb5e54faaf3ab2a8 /themes/nebirhos.zsh-theme
parent37266112759a5759536cc4ea84ea063695cd1f2e (diff)
parent1120f973054836eeb53750f57d69fbec41a340dc (diff)
downloadzsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.gz
zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.bz2
zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.zip
Merge remote branch 'upstream/master'
Conflicts: lib/completion.zsh
Diffstat (limited to 'themes/nebirhos.zsh-theme')
-rw-r--r--themes/nebirhos.zsh-theme4
1 files changed, 4 insertions, 0 deletions
diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
index c49df972e..c5864d9b8 100644
--- a/themes/nebirhos.zsh-theme
+++ b/themes/nebirhos.zsh-theme
@@ -4,6 +4,10 @@
# Get the current ruby version in use with RVM:
if [ -e ~/.rvm/bin/rvm-prompt ]; then
RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
+else
+ if which rbenv &> /dev/null; then
+ RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
+ fi
fi
# Get the host name (first 4 chars)