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

Fix broken fish's if statement

Browse Source
This commit is contained in:
Yamashita Yuu
2014-07-05 07:30:23 +09:00
parent 6b4d6249a0
commit aef2546319
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-sh-deactivate
View File

@@ -30,7 +30,7 @@ done
shell="$(basename "${PYENV_SHELL:-$SHELL}")" shell="$(basename "${PYENV_SHELL:-$SHELL}")"
case "$shell" in case "$shell" in
fish ) fish )
echo "if functions -q deactivate" echo "if functions -q deactivate;"
;; ;;
* ) * )
echo "if declare -f deactivate 1>/dev/null 2>&1; then" echo "if declare -f deactivate 1>/dev/null 2>&1; then"

8
test/deactivate.bats
View File

@@ -110,7 +110,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
if functions -q deactivate if functions -q deactivate;
setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE"; setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE; set -e PYENV_ACTIVATE;
deactivate; deactivate;
@@ -129,7 +129,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
if functions -q deactivate if functions -q deactivate;
setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE"; setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE; set -e PYENV_ACTIVATE;
deactivate; deactivate;
@@ -147,7 +147,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
if functions -q deactivate if functions -q deactivate;
pyenv shell --unset; pyenv shell --unset;
setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE"; setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE; set -e PYENV_ACTIVATE;
@@ -167,7 +167,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
if functions -q deactivate if functions -q deactivate;
pyenv shell --unset; pyenv shell --unset;
setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE"; setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE; set -e PYENV_ACTIVATE;