This commit is contained in:
GitHub Merge Button 2012-07-02 10:42:51 -07:00
commit 4c3a456d37

View file

@ -17,6 +17,20 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
FOUND_RBENV=1 FOUND_RBENV=1
export RBENV_ROOT=$rbenvdir export RBENV_ROOT=$rbenvdir
export PATH=${rbenvdir}/bin:$PATH export PATH=${rbenvdir}/bin:$PATH
fi
done
unset rbenvdir
# If not found above, check for the existence of the rbenv executable anyway.
if [ $FOUND_RBENV -eq 0 ] ; then
if ( which rbenv > /dev/null 2>&1 ) ; then
FOUND_RBENV=1
export RBENV_ROOT=$(rbenv root)
fi
fi
if [ $FOUND_RBENV -eq 1 ] ; then
eval "$(rbenv init -)" eval "$(rbenv init -)"
alias rubies="rbenv versions" alias rubies="rbenv versions"
@ -46,11 +60,8 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
echo "$(current_ruby)" echo "$(current_ruby)"
fi fi
} }
fi
done
unset rbenvdir
if [ $FOUND_RBENV -eq 0 ] ; then else
alias rubies='ruby -v' alias rubies='ruby -v'
function gemsets() { echo 'not supported' } function gemsets() { echo 'not supported' }
function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" } function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }