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

remove unnecessary logic from init script

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-06 17:58:09 +00:00
parent 7f33ddd911
commit 017d20ad91
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pyenv-sh-deactivate
View File

@@ -28,9 +28,9 @@ while [ $# -gt 0 ]; do
done done
shell="$(basename "${PYENV_SHELL:-$SHELL}")" shell="$(basename "${PYENV_SHELL:-$SHELL}")"
prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}" prefix="${VIRTUAL_ENV:-${PYENV_ACTIVATE}}"
if [ -z "${VIRTUAL_ENV}" ]; then if [ -z "${prefix}" ]; then
[ -n "$QUIET" ] || echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2 [ -n "$QUIET" ] || echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2
echo "false" echo "false"
exit 1 exit 1

39
bin/pyenv-virtualenv-init
View File

@@ -102,24 +102,14 @@ case "$shell" in
fish ) fish )
cat <<EOS cat <<EOS
function _pyenv_virtualenv_hook --on-event fish_prompt; function _pyenv_virtualenv_hook --on-event fish_prompt;
set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
set -l ret \$status set -l ret \$status
if [ -n "\$PYENV_ACTIVATE" ] if [ -n "\$VIRTUAL_ENV" ]
if [ (pyenv version-name 2>/dev/null; or true) = "system" ] if [ "\$VIRTUAL_ENV" != (pyenv prefix 2>/dev/null; or true) ]
pyenv deactivate --quiet pyenv deactivate --quiet; or true
set -e PYENV_DEACTIVATE pyenv activate --quiet; or true
return \$ret
end
if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
if pyenv deactivate --quiet
set -e PYENV_DEACTIVATE
pyenv activate --quiet; or set -e PYENV_DEACTIVATE
else
pyenv activate --quiet
end
end end
else else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ] if [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null; or true) ]
pyenv activate --quiet; or true pyenv activate --quiet; or true
end end
end end
@@ -142,22 +132,13 @@ esac
if [[ "$shell" != "fish" ]]; then if [[ "$shell" != "fish" ]]; then
cat <<EOS cat <<EOS
local ret=\$? local ret=\$?
if [ -n "\$PYENV_ACTIVATE" ]; then if [ -n "\$VIRTUAL_ENV" ]; then
if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-deactivate --quiet)" eval "\$(pyenv sh-deactivate --quiet)" || true
unset PYENV_DEACTIVATE eval "\$(pyenv sh-activate --quiet)" || true
return \$ret
fi
if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
if eval "\$(pyenv sh-deactivate --quiet)"; then
unset PYENV_DEACTIVATE
eval "\$(pyenv sh-activate --quiet)" || unset PYENV_DEACTIVATE
else
eval "\$(pyenv sh-activate --quiet)"
fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-activate --quiet)" || true eval "\$(pyenv sh-activate --quiet)" || true
fi fi
fi fi