Refactor pyenv plugin to use PATH

This commit is contained in:
Terrance Kennedy 2017-06-29 01:00:08 -06:00
parent 37c2d0ddd7
commit 12974ec6d5

View File

@ -1,50 +1,17 @@
_homebrew-installed() { # This plugin loads pyenv into the current shell and provides prompt info via
type brew &> /dev/null # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
}
_pyenv-from-homebrew-installed() { if which pyenv > /dev/null; then
brew --prefix pyenv &> /dev/null
}
FOUND_PYENV=0
pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
for pyenvdir in "${pyenvdirs[@]}" ; do
if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
FOUND_PYENV=1
export PYENV_ROOT=$pyenvdir
export PATH=${pyenvdir}/bin:$PATH
eval "$(pyenv init - zsh)" eval "$(pyenv init - zsh)"
if which pyenv-virtualenv-init > /dev/null; then
if pyenv commands | command grep -q virtualenv-init; then
eval "$(pyenv virtualenv-init - zsh)" eval "$(pyenv virtualenv-init - zsh)"
fi fi
function pyenv_prompt_info() { function pyenv_prompt_info() {
echo "$(pyenv version-name)" echo "$(pyenv version-name)"
} }
fi else
done # fallback to system python
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() { function pyenv_prompt_info() {
echo "$(pyenv version-name)" echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
} }
fi
fi
if [ $FOUND_PYENV -eq 0 ] ; then
function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
fi fi