Don't return rbenv or rvm if the don't exist

pull/185/head
Eric Baer 2013-01-25 12:51:28 -07:00
parent 94a47c3626
commit b517629303
1 changed files with 6 additions and 3 deletions

View File

@ -139,16 +139,20 @@ function hg_prompt_vars {
function rvm_version_prompt { function rvm_version_prompt {
if which rvm &> /dev/null; then if which rvm &> /dev/null; then
rvm=$(rvm tools identifier) || return rvm=$(rvm tools identifier) || return
if [ $rvm != "system" ]; then
echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX" echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
fi fi
fi
} }
function rbenv_version_prompt { function rbenv_version_prompt {
if which rbenv &> /dev/null; then if which rbenv &> /dev/null; then
rbenv=$(rbenv version-name) || return rbenv=$(rbenv version-name) || return
$(rbenv commands | grep -q gemset) && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}" $(rbenv commands | grep -q gemset) && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}"
if [ $rbenv != "system" ]; then
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX" echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
fi fi
fi
} }
function rbfu_version_prompt { function rbfu_version_prompt {
@ -207,4 +211,3 @@ function scm_char {
function prompt_char { function prompt_char {
scm_char scm_char
} }