summaryrefslogtreecommitdiff
path: root/themes/josh.zsh-theme
diff options
context:
space:
mode:
authorMax Masnick <max@masnick.me>2012-02-25 16:15:40 -0500
committerMax Masnick <max@masnick.me>2012-02-25 16:15:40 -0500
commit7441438afa9f96ff1d39a6cd0d8692c2b9044bf2 (patch)
tree508d195705e63c5baff4ed9ead765744feec323f /themes/josh.zsh-theme
parent9e3776f1ecbaa29d646cdfe8fc204597ca98746c (diff)
parent1120f973054836eeb53750f57d69fbec41a340dc (diff)
downloadzsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.gz
zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.bz2
zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.zip
merge changes from offical repo
Diffstat (limited to 'themes/josh.zsh-theme')
-rw-r--r--themes/josh.zsh-theme4
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index 6bed1a70e..142e76838 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -10,7 +10,7 @@ function josh_prompt {
prompt=" "
branch=$(current_branch)
- ruby_version=$(rvm_prompt_info)
+ ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
path_size=${#PWD}
branch_size=${#branch}
ruby_size=${#ruby_version}
@@ -31,7 +31,7 @@ function josh_prompt {
prompt=" $prompt"
done
- prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
+ prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)"
echo $prompt
}