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

fix broken tests

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-06 18:26:23 +00:00
parent 017d20ad91
commit 0fa5de07c9
7 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/pyenv-sh-deactivate
View File

@@ -36,7 +36,12 @@ if [ -z "${prefix}" ]; then
exit 1
fi
echo "pyenv-virtualenv: deactivate ${prefix##*/}" 1>&2
if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
version="$(basename "${prefix%/envs/*}")/envs/${prefix##*/}"
else
version="${prefix##*/}"
fi
echo "pyenv-virtualenv: deactivate ${version}" 1>&2
if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
# shell version set in pyenv-sh-activate should be unset

6
bin/pyenv-virtualenv-init
View File

@@ -134,12 +134,12 @@ if [[ "$shell" != "fish" ]]; then
local ret=\$?
if [ -n "\$VIRTUAL_ENV" ]; then
if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-deactivate --quiet)" || true
eval "\$(pyenv sh-activate --quiet)" || true
eval "\$(pyenv sh-deactivate --quiet || true)" || true
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
else
if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-activate --quiet)" || true
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
fi
return \$ret