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

replaced --no-error by --quiet

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-06 17:33:40 +00:00
parent bf7e9ba59a
commit 8731e9bf14
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/pyenv-virtualenv-init
View File

@@ -106,21 +106,21 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
set -l ret \$status
if [ -n "\$PYENV_ACTIVATE" ]
if [ (pyenv version-name 2>/dev/null; or true) = "system" ]
pyenv deactivate --no-error
pyenv deactivate --quiet
set -e PYENV_DEACTIVATE
return \$ret
end
if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
if pyenv deactivate --no-error
if pyenv deactivate --quiet
set -e PYENV_DEACTIVATE
pyenv activate --no-error; or set -e PYENV_DEACTIVATE
pyenv activate --quiet; or set -e PYENV_DEACTIVATE
else
pyenv activate --no-error
pyenv activate --quiet
end
end
else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
pyenv activate --no-error; or true
pyenv activate --quiet; or true
end
end
return \$ret
@@ -144,21 +144,21 @@ if [[ "$shell" != "fish" ]]; then
local ret=\$?
if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
eval "\$(pyenv sh-deactivate --no-error)"
eval "\$(pyenv sh-deactivate --quiet)"
unset PYENV_DEACTIVATE
return \$ret
fi
if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
if eval "\$(pyenv sh-deactivate --no-error)"; then
if eval "\$(pyenv sh-deactivate --quiet)"; then
unset PYENV_DEACTIVATE
eval "\$(pyenv sh-activate --no-error)" || unset PYENV_DEACTIVATE
eval "\$(pyenv sh-activate --quiet)" || unset PYENV_DEACTIVATE
else
eval "\$(pyenv sh-activate --no-error)"
eval "\$(pyenv sh-activate --quiet)"
fi
fi
else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-activate --no-error)" || true
eval "\$(pyenv sh-activate --quiet)" || true
fi
fi
return \$ret