From 30687c414785fbc7d7d7d44ae60166075be75da7 Mon Sep 17 00:00:00 2001
From: Alexander Simonov <alex@simonov.me>
Date: Sun, 22 May 2011 01:31:11 +0200
Subject: Fix RVM loading and RVM ruby version info

---
 lib/rvm.zsh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib/rvm.zsh')

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"
 }
-- 
cgit v1.2.3-70-g09d2


From 27841ca7c1bb6bd19e0eb66e1dcc8fa3a6a6ebba Mon Sep 17 00:00:00 2001
From: Alexander Simonov <alex@simonov.me>
Date: Sun, 2 Dec 2012 20:30:25 +0200
Subject: Set default for rvm prompt prefix/suffix

---
 lib/rvm.zsh               | 5 +----
 themes/simonoff.zsh-theme | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/rvm.zsh')

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index a0a48960e..e8744e61e 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,11 +1,8 @@
-# load RVM
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
-
 # get the name of the ruby version
 function rvm_prompt_info() {
   [ -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"
+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index 01f381c48..fb4d32e24 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -95,7 +95,6 @@ setprompt () {
     # Modify RVM prompt
     ZSH_THEME_RVM_PROMPT_PREFIX=" ["
     ZSH_THEME_RVM_PROMPT_SUFFIX="]"
-    ZSH_THEME_RVM_PROMPT_OPTIONS=(v i)
 
 
 ###
-- 
cgit v1.2.3-70-g09d2