summaryrefslogtreecommitdiff
path: root/themes/josh.zsh-theme
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-01-25 18:14:29 -0800
committerRobby Russell <robby@planetargon.com>2012-01-25 18:14:29 -0800
commitb56e37201dd6cf00a667daa1f033cfb1b1669b4a (patch)
tree0be7579715d81186b2ba2c8361ff620eb544d878 /themes/josh.zsh-theme
parent9dc9cae55f5aa9ab12db71da64ab062906d8504b (diff)
parent6496acf58bf8531809490b52e34811f74a27cc7c (diff)
downloadzsh-b56e37201dd6cf00a667daa1f033cfb1b1669b4a.tar.gz
zsh-b56e37201dd6cf00a667daa1f033cfb1b1669b4a.tar.bz2
zsh-b56e37201dd6cf00a667daa1f033cfb1b1669b4a.zip
Merge pull request #860 from sbfaulkner/rbenv-support-for-themes
adding rbenv support to all the rvm themes
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
}