Respect RBENV_ROOT and PYENV_ROOT if set
This commit is contained in:
parent
37c2d0ddd7
commit
345600d436
@ -9,6 +9,10 @@ _pyenv-from-homebrew-installed() {
|
|||||||
FOUND_PYENV=0
|
FOUND_PYENV=0
|
||||||
pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
|
pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
|
||||||
|
|
||||||
|
if [[ -n "$PYENV_ROOT" ]]; then
|
||||||
|
pyenvdirs=($PYENV_ROOT "${pyenvdirs[@]}")
|
||||||
|
fi
|
||||||
|
|
||||||
for pyenvdir in "${pyenvdirs[@]}" ; do
|
for pyenvdir in "${pyenvdirs[@]}" ; do
|
||||||
if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
|
if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
|
||||||
FOUND_PYENV=1
|
FOUND_PYENV=1
|
||||||
|
@ -12,6 +12,10 @@ if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null)
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$RBENV_ROOT" ]]; then
|
||||||
|
rbenvdirs=($RBENV_ROOT "${rbenvdirs[@]}")
|
||||||
|
fi
|
||||||
|
|
||||||
for rbenvdir in "${rbenvdirs[@]}" ; do
|
for rbenvdir in "${rbenvdirs[@]}" ; do
|
||||||
if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
|
if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
|
||||||
FOUND_RBENV=1
|
FOUND_RBENV=1
|
||||||
|
Loading…
Reference in New Issue
Block a user