diff options
| author | Alexander Simonov <alex@simonov.me> | 2011-05-22 01:31:11 +0200 |
|---|---|---|
| committer | Alexander Simonov <alex@simonov.me> | 2012-12-02 20:00:11 +0200 |
| commit | 30687c414785fbc7d7d7d44ae60166075be75da7 (patch) | |
| tree | b7b549649ce01142031ea08cc9eea069de73f41d /lib | |
| parent | f9de64460ce51e105f27d30a9ecb20612ab65d57 (diff) | |
| download | zsh-30687c414785fbc7d7d7d44ae60166075be75da7.tar.gz zsh-30687c414785fbc7d7d7d44ae60166075be75da7.tar.bz2 zsh-30687c414785fbc7d7d7d44ae60166075be75da7.zip | |
Fix RVM loading and RVM ruby version info
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rvm.zsh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/rvm.zsh b/lib/rvm.zsh index cb870a9bb..a0a48960e 100644 --- a/lib/rvm.zsh +++ b/lib/rvm.zsh @@ -1,5 +1,11 @@ -# get the name of the branch we are on +# load RVM +[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm + +# 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" } |