diff options
| author | Michael A. Smith <michael@smith-li.com> | 2019-07-26 05:02:31 -0400 |
|---|---|---|
| committer | Bernát Gábor <bgabor8@bloomberg.net> | 2019-07-26 10:02:31 +0100 |
| commit | 6ab16b3e609623816049771a085bdcc51f0b99e9 (patch) | |
| tree | fbad77f8bc75a2c3f54c714f00bc32deac7fef51 | |
| parent | 3c69ce7cf791f5de99267d9b427d7fba4520c58d (diff) | |
| download | virtualenv-6ab16b3e609623816049771a085bdcc51f0b99e9.tar.gz | |
Fix bashism preventing virtualenv in sh (#1396)
* Fix bashism preventing virtualenv in sh
In #1372 a bug was introduced making activate fail in non-bash sh shells. This fixes it.
* embed and add changelog
| -rw-r--r-- | docs/changelog/1396.bugfix.rst | 1 | ||||
| -rwxr-xr-x | virtualenv.py | 30 | ||||
| -rw-r--r-- | virtualenv_embedded/activate.sh | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/docs/changelog/1396.bugfix.rst b/docs/changelog/1396.bugfix.rst new file mode 100644 index 0000000..536831b --- /dev/null +++ b/docs/changelog/1396.bugfix.rst @@ -0,0 +1 @@ +fix regression - sh activation script not working under sh (only bash) diff --git a/virtualenv.py b/virtualenv.py index faf5f7a..6d0d1c4 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -2294,21 +2294,21 @@ IWNQ+EMONwZIp5gxI994rJ0KayiC/wegEfUH # file activate.sh ACTIVATE_SH = convert( """ -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 """ ) diff --git a/virtualenv_embedded/activate.sh b/virtualenv_embedded/activate.sh index 2f86735..d9b8781 100644 --- a/virtualenv_embedded/activate.sh +++ b/virtualenv_embedded/activate.sh @@ -2,7 +2,7 @@ # you cannot run it directly -if [[ "${BASH_SOURCE-}" = "$0" ]]; then +if [ "${BASH_SOURCE-}" = "$0" ]; then echo "You must source this script: \$ source $0" >&2 exit 33 fi |