diff options
| author | James Smith <james@loopj.com> | 2012-07-24 13:39:07 -0700 |
|---|---|---|
| committer | James Smith <james@loopj.com> | 2012-07-24 13:39:07 -0700 |
| commit | 772bc51c3a2372592c400e0d4e159a0128989ba2 (patch) | |
| tree | 191af002e272ce95418910b9c0ea63443e48e681 /themes/josh.zsh-theme | |
| parent | 0ba398f9e1aaf05e72406d5c840f013eebb6b260 (diff) | |
| parent | d05b2010ffd4cd33ff9402c402051b1caf985d97 (diff) | |
| download | zsh-772bc51c3a2372592c400e0d4e159a0128989ba2.tar.gz zsh-772bc51c3a2372592c400e0d4e159a0128989ba2.tar.bz2 zsh-772bc51c3a2372592c400e0d4e159a0128989ba2.zip | |
Merge
Diffstat (limited to 'themes/josh.zsh-theme')
| -rw-r--r-- | themes/josh.zsh-theme | 4 |
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 } |