m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-11 13:03:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop buzzy errors from embeded shell functions

Browse Source
This commit is contained in:
Yamashita Yuu
2014-10-27 10:36:10 +09:00
parent a02eb0a396
commit 2060c43387
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pyenv-virtualenv-init
View File

@@ -81,7 +81,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
set -e PYENV_DEACTIVATE set -e PYENV_DEACTIVATE
return 0 return 0
end end
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ] if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ]
if pyenv deactivate --no-error --verbose if pyenv deactivate --no-error --verbose
set -e PYENV_DEACTIVATE set -e PYENV_DEACTIVATE
pyenv activate --no-error --verbose; or 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
end end
else 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 pyenv activate --no-error --verbose
end end
end end
@@ -117,7 +117,7 @@ if [[ "$shell" != "fish" ]]; then
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
return 0 return 0
fi fi
if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
@@ -126,7 +126,7 @@ if [[ "$shell" != "fish" ]]; then
fi fi
fi fi
else 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 pyenv activate --no-error --verbose
fi fi
fi fi