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

Allow activating first version of virtualenv even if there are multiple versions in pyenv (#105)

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-08 05:18:25 +00:00
parent ce6ec4f173
commit f7d1aa7d94
3 changed files with 79 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/pyenv-virtualenv-init
View File

@@ -104,14 +104,9 @@ fish )
function _pyenv_virtualenv_hook --on-event fish_prompt;
set -l ret \$status
if [ -n "\$VIRTUAL_ENV" ]
if [ "\$VIRTUAL_ENV" != (pyenv prefix 2>/dev/null; or true) ]
pyenv deactivate --quiet; or true
pyenv activate --quiet; or true
end
pyenv activate --deactivate --quiet; or pyenv deactivate --quiet; or true
else
if [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null; or true) ]
pyenv activate --quiet; or true
end
pyenv activate --quiet; or true
end
return \$ret
end
@@ -133,14 +128,9 @@ if [[ "$shell" != "fish" ]]; then
cat <<EOS
local ret=\$?
if [ -n "\$VIRTUAL_ENV" ]; then
if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-deactivate --quiet || true)" || true
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
eval "\$(pyenv sh-activate --deactivate --quiet || pyenv sh-deactivate --quiet || true)" || true
else
if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
return \$ret
};