rbenv plugin now properly finds homebrew-installed rbenv (fixes #878)

This commit is contained in:
Dylan Markow 2012-01-30 14:53:26 -08:00
commit 6402e8b599

View file

@ -4,6 +4,17 @@ for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; 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
# Check for homebrew rbenv (installed directly in /usr/local/bin)
if [ -f /usr/local/bin/rbenv -a $FOUND_RBENV -eq 0 ] ; then
FOUND_RBENV=1
fi
if [ $FOUND_RBENV -eq 1 ] ; then
eval "$(rbenv init -)" eval "$(rbenv init -)"
alias rubies="rbenv versions" alias rubies="rbenv versions"
@ -33,11 +44,8 @@ for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; 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 ' ')" }