From 228ac4ceec932a8d1d698a7d60d34ae50b5f51e5 Mon Sep 17 00:00:00 2001 From: Luke Culbertson Date: Thu, 2 Oct 2014 00:16:39 -0700 Subject: [PATCH] Run `pyenv virtualenvwrapper` and remove virtualenv-init cmd --- plugins/available/pyenv-virtualenv.plugin.bash | 2 ++ plugins/available/pyenv.plugin.bash | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/available/pyenv-virtualenv.plugin.bash b/plugins/available/pyenv-virtualenv.plugin.bash index 78a1a550..ca262b51 100644 --- a/plugins/available/pyenv-virtualenv.plugin.bash +++ b/plugins/available/pyenv-virtualenv.plugin.bash @@ -5,6 +5,8 @@ about-plugin 'pyenv-virtualenvwrapper helper functions' export PYENV_VIRTUALENVWRAPPER_PREFER_PYVENV="true" +[[ `which pyenv` ]] && eval "$(pyenv virtualenv)" + # Activate autoenv source /usr/local/opt/autoenv/activate.sh diff --git a/plugins/available/pyenv.plugin.bash b/plugins/available/pyenv.plugin.bash index a9034ee7..dd712f87 100644 --- a/plugins/available/pyenv.plugin.bash +++ b/plugins/available/pyenv.plugin.bash @@ -6,10 +6,5 @@ export PATH="$PYENV_PATH:$PATH" [[ `which pyenv` ]] && eval "$(pyenv init -)" -#Load pyenv virtualenv if the virtualenv plugin is installed. -if pyenv virtualenv-init - &> /dev/null; then - eval "$(pyenv virtualenv-init -)" -fi - # Load the auto-completion script if pyenv was loaded. [[ -e $PYENV_ROOT/completions/pyenv.bash ]] && source $PYENV_ROOT/completions/pyenv.bash