diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-02 12:20:31 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-02 12:20:31 -0800 |
| commit | 1417111bad20ec4da6747a9a11b2904a58c6e7f8 (patch) | |
| tree | 4cad4d5c0aac741a301c75917b269128c0121cad /lib/rvm.zsh | |
| parent | d3b867d96739db83be762c607cc6f978429250a4 (diff) | |
| parent | 27841ca7c1bb6bd19e0eb66e1dcc8fa3a6a6ebba (diff) | |
| download | zsh-1417111bad20ec4da6747a9a11b2904a58c6e7f8.tar.gz zsh-1417111bad20ec4da6747a9a11b2904a58c6e7f8.tar.bz2 zsh-1417111bad20ec4da6747a9a11b2904a58c6e7f8.zip | |
Merge pull request #1453 from simonoff/master
new theme and rvm theming support
Diffstat (limited to 'lib/rvm.zsh')
| -rw-r--r-- | lib/rvm.zsh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/rvm.zsh b/lib/rvm.zsh index cb870a9bb..e8744e61e 100644 --- a/lib/rvm.zsh +++ b/lib/rvm.zsh @@ -1,5 +1,8 @@ -# get the name of the branch we are on +# get the name of the ruby version function rvm_prompt_info() { - ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return - [[ ! -z $ruby_version ]] && echo "($ruby_version)" + [ -f $HOME/.rvm/bin/rvm-prompt ] || return + local rvm_prompt + rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null) + [[ "${rvm_prompt}x" == "x" ]] && return + echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}" } |