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

No need to use eval in fish init script

Browse Source
This commit is contained in:
Yamashita Yuu
2014-07-05 07:26:48 +09:00
parent 0de2cdbbc3
commit 6b4d6249a0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pyenv-virtualenv-init
View File

@@ -77,19 +77,19 @@ fish )
function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ -n "\$PYENV_ACTIVATE" ]
if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate --no-error --verbose)
pyenv deactivate --no-error --verbose
return 0
end
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
if eval (pyenv sh-deactivate --no-error --verbose)
eval (pyenv sh-activate --no-error --verbose); or set -e PYENV_DEACTIVATE
if pyenv deactivate --no-error --verbose
pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
else
eval (pyenv sh-activate --no-error --verbose)
pyenv activate --no-error --verbose
end
end
else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
eval (pyenv sh-activate --no-error --verbose)
pyenv activate --no-error --verbose
end
end
end

10
test/init.bats
View File

@@ -63,19 +63,19 @@ setenv PYENV_VIRTUALENV_INIT 1;
function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ -n "\$PYENV_ACTIVATE" ]
if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate --no-error --verbose)
pyenv deactivate --no-error --verbose
return 0
end
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
if eval (pyenv sh-deactivate --no-error --verbose)
eval (pyenv sh-activate --no-error --verbose); or set -e PYENV_DEACTIVATE
if pyenv deactivate --no-error --verbose
pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
else
eval (pyenv sh-activate --no-error --verbose)
pyenv activate --no-error --verbose
end
end
else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
eval (pyenv sh-activate --no-error --verbose)
pyenv activate --no-error --verbose
end
end
end