summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/rvm.zsh5
-rw-r--r--themes/simonoff.zsh-theme1
2 files changed, 1 insertions, 5 deletions
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)
###