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

Fix deactivation issue with system version

Browse Source 
$ pyenv global system
    $ pyenv shell venv
    (venv) $ pyenv shell --unset
    (venv) $ pyenv version
    system (set by /home/yamashita/.pyenv/version)
    (venv) $ pyenv which python
    /home/yamashita/.pyenv/versions/venv/bin/python # <-- should be `/usr/bin/python` (system)
This commit is contained in:
Yamashita Yuu
2014-06-13 19:30:37 +09:00
parent e853f74b26
commit 21e999cc7c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/pyenv-virtualenv-init
View File

@@ -66,8 +66,10 @@ case "$shell" in
bash ) bash )
cat <<EOS cat <<EOS
_pyenv_virtualenv_hook() { _pyenv_virtualenv_hook() {
if [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then if [[ "\$(pyenv version-name)" == "system" ]]; then
pyenv deactivate; pyenv deactivate || true;
elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
pyenv deactivate || true;
pyenv activate 2>/dev/null || true pyenv activate 2>/dev/null || true
fi fi
}; };
@@ -79,8 +81,10 @@ EOS
fish ) fish )
cat <<EOS cat <<EOS
function _pyenv_virtualenv_hook --on-event fish_prompt; function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ "\$VIRTUAL_ENV" != (pyenv prefix) ] if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate) eval (pyenv sh-deactivate); or true
else if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
eval (pyenv sh-deactivate); or true
eval (pyenv sh-activate 2>/dev/null); or true eval (pyenv sh-activate 2>/dev/null); or true
end end
end end
@@ -89,8 +93,10 @@ EOS
zsh ) zsh )
cat <<EOS cat <<EOS
_pyenv_virtualenv_hook() { _pyenv_virtualenv_hook() {
if [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then if [[ "\$(pyenv version-name)" == "system" ]]; then
pyenv deactivate pyenv deactivate || true
elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
pyenv deactivate || true
pyenv activate 2>/dev/null || true pyenv activate 2>/dev/null || true
fi fi
} }