Fix fish syntax error at else

This commit is contained in:
Yamashita Yuu
2014-07-04 20:51:31 +09:00
parent f0c400b669
commit c2b5bbd19a
2 changed files with 13 additions and 10 deletions

View File

@@ -33,17 +33,20 @@ fi
case "$shell" in case "$shell" in
fish ) fish )
echo " setenv PYENV_DEACTIVATE \"\$VIRTUAL_ENV\";" cat <<EOS
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else;
EOS
;; ;;
* ) * )
echo " export PYENV_DEACTIVATE=\"\$VIRTUAL_ENV\";" cat <<EOS
;; export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
esac
cat <<EOS
deactivate; deactivate;
else else
EOS EOS
;;
esac
if [ -z "$QUIET" ]; then if [ -z "$QUIET" ]; then
echo " echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;" echo " echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"

View File

@@ -84,7 +84,7 @@ EOS
if functions -q deactivate if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV"; setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate; deactivate;
else else;
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2; echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false; false;
end; end;
@@ -101,7 +101,7 @@ EOS
if functions -q deactivate if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV"; setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate; deactivate;
else else;
false; false;
end; end;
EOS EOS
@@ -118,7 +118,7 @@ if functions -q deactivate
pyenv shell --unset; pyenv shell --unset;
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV"; setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate; deactivate;
else else;
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2; echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false; false;
end; end;
@@ -136,7 +136,7 @@ if functions -q deactivate
pyenv shell --unset; pyenv shell --unset;
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV"; setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate; deactivate;
else else;
false; false;
end; end;
EOS EOS