Exit as error on deactivation failures

This commit is contained in:
Yamashita Yuu
2014-07-04 20:33:22 +09:00
parent 0b5e0cf592
commit 5b3b909089
2 changed files with 18 additions and 0 deletions

View File

@@ -30,6 +30,9 @@ fish )
cat <<EOS
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
end;
EOS
;;
@@ -37,6 +40,9 @@ EOS
cat <<EOS
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
fi;
EOS
;;

View File

@@ -16,6 +16,9 @@ setup() {
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
fi;
EOS
}
@@ -31,6 +34,9 @@ if declare -f deactivate 1>/dev/null 2>&1; then
pyenv shell --unset;
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
fi;
EOS
}
@@ -45,6 +51,9 @@ EOS
if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
end;
EOS
}
@@ -60,6 +69,9 @@ if functions -q deactivate
pyenv shell --unset;
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
end;
EOS
}