Commit dfc03c7b authored by Luke Lazurite's avatar Luke Lazurite Committed by Robby Russell
Browse files

optimize load of pyenv with homebrew (#6142)

parent 9edde095
...@@ -8,9 +8,6 @@ _pyenv-from-homebrew-installed() { ...@@ -8,9 +8,6 @@ _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 _homebrew-installed && _pyenv-from-homebrew-installed ; then
pyenvdirs=($(brew --prefix pyenv) "${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
...@@ -30,6 +27,24 @@ for pyenvdir in "${pyenvdirs[@]}" ; do ...@@ -30,6 +27,24 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
done done
unset pyenvdir unset pyenvdir
if [ $FOUND_PYENV -eq 0 ] ; then
pyenvdir=$(brew --prefix pyenv 2> /dev/null)
if [ $? -eq 0 -a -d $pyenvdir/bin ] ; then
FOUND_PYENV=1
export PYENV_ROOT=$pyenvdir
export PATH=${pyenvdir}/bin:$PATH
eval "$(pyenv init - zsh)"
if pyenv commands | command grep -q virtualenv-init; then
eval "$(pyenv virtualenv-init - zsh)"
fi
function pyenv_prompt_info() {
echo "$(pyenv version-name)"
}
fi
fi
if [ $FOUND_PYENV -eq 0 ] ; then if [ $FOUND_PYENV -eq 0 ] ; then
function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" } function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
fi fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment