From 2060c43387d452a00d2aed0f094fc8e248bdb0db Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Mon, 27 Oct 2014 10:36:10 +0900 Subject: [PATCH] Stop buzzy errors from embeded shell functions --- bin/pyenv-virtualenv-init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init index 66562a1..64e6c59 100755 --- a/bin/pyenv-virtualenv-init +++ b/bin/pyenv-virtualenv-init @@ -81,7 +81,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; set -e PYENV_DEACTIVATE return 0 end - if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ] + if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ] if pyenv deactivate --no-error --verbose set -e PYENV_DEACTIVATE pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE @@ -90,7 +90,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; end end else - if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ] + if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null) ] pyenv activate --no-error --verbose end end @@ -117,7 +117,7 @@ if [[ "$shell" != "fish" ]]; then unset PYENV_DEACTIVATE return 0 fi - if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then + if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then if pyenv deactivate --no-error --verbose; then unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE @@ -126,7 +126,7 @@ if [[ "$shell" != "fish" ]]; then fi fi else - if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then + if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then pyenv activate --no-error --verbose fi fi