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

need to use functions -q to check existence of the function in fish (#136)

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-12-29 09:03:31 +00:00
parent 0b42fbc27d
commit 13b7dc172a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-sh-deactivate
View File

@@ -162,7 +162,7 @@ esac
case "${shell}" in case "${shell}" in
fish ) fish )
cat <<EOS cat <<EOS
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS

2
test/conda-deactivate.bats
View File

@@ -77,7 +77,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS

10
test/deactivate.bats
View File

@@ -228,7 +228,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS
@@ -255,7 +255,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS
@@ -284,7 +284,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS
@@ -313,7 +313,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS
@@ -340,7 +340,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -g deactivate; if functions -q deactivate;
functions -e deactivate; functions -e deactivate;
end; end;
EOS EOS