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

Merge pull request #40 from s0undt3ch/master

Browse Source 
Fix weird bash code issue which made bash complain about "then"
This commit is contained in:
Yamashita, Yuu
2014-08-14 10:03:35 +09:00
parent c9bcef656c 81736da905
commit 2cc21f112c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pyenv-virtualenv-init
View File

@@ -110,11 +110,11 @@ esac
if [[ "$shell" != "fish" ]]; then if [[ "$shell" != "fish" ]]; then
cat <<EOS cat <<EOS
if [ -n "\$PYENV_ACTIVATE" ]; then if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then if [ "\$(pyenv version-name)" = "system" ]; then
pyenv deactivate --no-error --verbose pyenv deactivate --no-error --verbose
return 0 return 0
fi fi
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
else else
@@ -122,7 +122,7 @@ if [[ "$shell" != "fish" ]]; then
fi fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
fi fi
fi fi

12
test/init.bats
View File

@@ -32,11 +32,11 @@ load test_helper
export PYENV_VIRTUALENV_INIT=1; export PYENV_VIRTUALENV_INIT=1;
_pyenv_virtualenv_hook() { _pyenv_virtualenv_hook() {
if [ -n "\$PYENV_ACTIVATE" ]; then if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then if [ "\$(pyenv version-name)" = "system" ]; then
pyenv deactivate --no-error --verbose pyenv deactivate --no-error --verbose
return 0 return 0
fi fi
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
else else
@@ -44,7 +44,7 @@ _pyenv_virtualenv_hook() {
fi fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
fi fi
fi fi
@@ -89,11 +89,11 @@ EOS
export PYENV_VIRTUALENV_INIT=1; export PYENV_VIRTUALENV_INIT=1;
_pyenv_virtualenv_hook() { _pyenv_virtualenv_hook() {
if [ -n "\$PYENV_ACTIVATE" ]; then if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then if [ "\$(pyenv version-name)" = "system" ]; then
pyenv deactivate --no-error --verbose pyenv deactivate --no-error --verbose
return 0 return 0
fi fi
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
else else
@@ -101,7 +101,7 @@ _pyenv_virtualenv_hook() {
fi fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
fi fi
fi fi