diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
| commit | 2595484a97d85496fdcdca99a23f52eecd9b1b43 (patch) | |
| tree | fffe23d53a2a635f0861047fb058c8a2632414f7 /lib/rvm.zsh | |
| parent | 8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (diff) | |
| parent | 6e6cf4303712befb5a7fc3918494aefe4a65991f (diff) | |
| download | zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.gz zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.bz2 zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
lib/aliases.zsh
Diffstat (limited to 'lib/rvm.zsh')
| -rw-r--r-- | lib/rvm.zsh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/rvm.zsh b/lib/rvm.zsh index 597be1b33..e8744e61e 100644 --- a/lib/rvm.zsh +++ b/lib/rvm.zsh @@ -1,7 +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 - 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:=)}" } - - |