summaryrefslogtreecommitdiff
path: root/themes/gallois.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/gallois.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/gallois.zsh-theme')
-rw-r--r--themes/gallois.zsh-theme6
1 files changed, 5 insertions, 1 deletions
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f9406dd96..3eac14867 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -15,7 +15,11 @@ git_custom_status() {
if [[ -s ~/.rvm/scripts/rvm ]] ; then
RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
else
- RPS1='$(git_custom_status) $EPS1'
+ if which rbenv &> /dev/null; then
+ RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
+ else
+ RPS1='$(git_custom_status) $EPS1'
+ fi
fi
PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '