30687c414785fbc7d7d7d44ae60166075be75da7

Author
Alexander Simonov <alex@simonov.me>
Committer
Alexander Simonov <alex@simonov.me>
Date

Message

Fix RVM loading and RVM ruby version info

Diff

 1diff --git a/lib/rvm.zsh b/lib/rvm.zsh
 2index cb870a9bbca96bfa1f3a1d795510daf1ef7c63b4..a0a48960ef359ee27cfd4288f56cca85d37c2824 100644
 3--- a/lib/rvm.zsh
 4+++ b/lib/rvm.zsh
 5@@ -1,5 +1,11 @@
 6-# get the name of the branch we are on
 7+# load RVM
 8+[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 9+
10+# get the name of the ruby version
11 function rvm_prompt_info() {
12-  ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
13-  [[ ! -z $ruby_version ]] && echo "($ruby_version)"
14+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return
15+  local rvm_prompt
16+  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
17+  [[ "${rvm_prompt}x" == "x" ]] && return
18+  echo "$ZSH_THEME_RVM_PROMPT_PREFIX$rvm_prompt$ZSH_THEME_RVM_PROMPT_SUFFIX"
19 }