From 227a511d67ad66418b2f73ddce748e886d5322a4 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Tue, 19 Jan 2016 17:45:59 +1100 Subject: [PATCH 1/5] Remove some brackets in bat, solves #35 --- docs/changes.rst | 2 ++ virtualenv_embedded/activate.bat | 51 +++++++++++++++--------------- virtualenv_embedded/deactivate.bat | 19 ++++++----- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index d5495c4e1..114dab794 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -27,6 +27,8 @@ Release History * Remove virtualenv file's path from directory when executing with a new python. Fixes issue :issue:`779`, :issue:`763` (:pull:`805`) +* Remove use of () in .bat files so ``Program Files (x86)`` works :issue:`35` + 13.1.2 (2015-08-23) ------------------- diff --git a/virtualenv_embedded/activate.bat b/virtualenv_embedded/activate.bat index 4c2003ef5..5eed99ff4 100644 --- a/virtualenv_embedded/activate.bat +++ b/virtualenv_embedded/activate.bat @@ -1,26 +1,25 @@ -@echo off -set "VIRTUAL_ENV=__VIRTUAL_ENV__" - -if defined _OLD_VIRTUAL_PROMPT ( - set "PROMPT=%_OLD_VIRTUAL_PROMPT%" -) else ( - if not defined PROMPT ( - set "PROMPT=$P$G" - ) - set "_OLD_VIRTUAL_PROMPT=%PROMPT%" -) -set "PROMPT=__VIRTUAL_WINPROMPT__ %PROMPT%" - -if not defined _OLD_VIRTUAL_PYTHONHOME ( - set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%" -) -set PYTHONHOME= - -if defined _OLD_VIRTUAL_PATH ( - set "PATH=%_OLD_VIRTUAL_PATH%" -) else ( - set "_OLD_VIRTUAL_PATH=%PATH%" -) -set "PATH=%VIRTUAL_ENV%\__BIN_NAME__;%PATH%" - -:END +@echo off +set "VIRTUAL_ENV=__VIRTUAL_ENV__" + +if defined _OLD_VIRTUAL_PROMPT ( + set "PROMPT=%_OLD_VIRTUAL_PROMPT%" +) else ( + if not defined PROMPT ( + set "PROMPT=$P$G" + ) + set "_OLD_VIRTUAL_PROMPT=%PROMPT%" +) +set "PROMPT=__VIRTUAL_WINPROMPT__ %PROMPT%" + +REM Don't use () to avoid problems with them in %PATH% +if not defined _OLD_VIRTUAL_PYTHONHOME + set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%" + +set PYTHONHOME= + +if defined _OLD_VIRTUAL_PATH + set "PATH=%_OLD_VIRTUAL_PATH%" +if not defined _OLD_VIRTUAL_PATH + set "_OLD_VIRTUAL_PATH=%PATH%" + +set "PATH=%VIRTUAL_ENV%\__BIN_NAME__;%PATH%" diff --git a/virtualenv_embedded/deactivate.bat b/virtualenv_embedded/deactivate.bat index fd4db2645..7bbc56882 100644 --- a/virtualenv_embedded/deactivate.bat +++ b/virtualenv_embedded/deactivate.bat @@ -2,19 +2,18 @@ set VIRTUAL_ENV= -if defined _OLD_VIRTUAL_PROMPT ( +REM Don't use () to avoid problems with them in %PATH% +if not defined _OLD_VIRTUAL_PROMPT goto ENDIFVPROMPT set "PROMPT=%_OLD_VIRTUAL_PROMPT%" - set _OLD_VIRTUAL_PROMPT= -) + set _OLD_VIRTUAL_PROMPT= +:ENDIFVPROMPT -if defined _OLD_VIRTUAL_PYTHONHOME ( +if not defined _OLD_VIRTUAL_PYTHONHOME goto ENDIFVHOME set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%" set _OLD_VIRTUAL_PYTHONHOME= -) +:ENDIFVHOME -if defined _OLD_VIRTUAL_PATH ( +if not defined _OLD_VIRTUAL_PATH goto ENDIFVPATH set "PATH=%_OLD_VIRTUAL_PATH%" - set _OLD_VIRTUAL_PATH= -) - -:END + set _OLD_VIRTUAL_PATH= +:ENDIFVPATH From 2dc651d72b400040dfd08f1cb20d99f9859d3b9f Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Tue, 19 Jan 2016 17:49:51 +1100 Subject: [PATCH 2/5] Add bat changes to virtualenv.py --- virtualenv.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/virtualenv.py b/virtualenv.py index b7381813e..f04593f4d 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -1928,17 +1928,19 @@ def convert(s): ##file activate.bat ACTIVATE_BAT = convert(""" -eJx9UdEKgjAUfW6wfxjiIH+hEDKUFHSKLCMI7kNOEkIf9P9pTJ3OLJ/03HPPPed4Es9XS9qqwqgT -PbGKKOdXL4aAFS7A4gvAwgijuiKlqOpGlATS2NeMLE+TjJM9RkQ+SmqAXLrBo1LLIeLdiWlD6jZt -r7VNubWkndkXaxg5GO3UaOOKS6drO3luDDiO5my3iA0YAKGzPRV1ack8cOdhysI0CYzIPzjSiH5X -0QcvC8Lfaj0emsVKYF2rhL5L3fCkVjV76kShi59NHwDniAHzkgDgqBcwOgTMx+gDQQqXCw== +eJx9UmFrgzAQ/X6/4ggNm79hCHNUpqBRxHUMCkc7IwZaM2a2/v3GttPo2uZTcu/lvXeXPMvPRqOu +a+ikQbaKi/ItSCgUK5/IORExAFVjJWvVygopS5YDnhdZmpf4CGjXSedc8fkVGmfgodx18sK3oq02 +g/BEa663yBev7IR4o9cVD5+PXuAKjD29x+JcI8KRDUWY4lK3DwZ/+oQeGo2bX60q/PrW253cd3hQ +pkHTyD2q1l4NyojDrIlppI8yykSUpeGtzAPB5h72fZqe66B3XsCmcKZvT/PZ9zHZ/ZwTjX+Qzy8a +4Hg4P4SviV5iQSJIQ6KnP/YRdPeuHw== """) ##file deactivate.bat DEACTIVATE_BAT = convert(""" -eJxzSE3OyFfIT0vj4ipOLVEI8wwKCXX0iXf1C7Pl4spMU0hJTcvMS01RiPf3cYmHyQYE+fsGhCho -cCkAAUibEkTEVhWLMlUlLk6QGixStlyaeCyJDPHw9/Pw93VFsQguim4ZXAJoIUw5DhX47XUM8UCx -EchHtwsohN1bILUgw61c/Vy4AJYPYm4= +eJx9kN0KgkAUhO/3KQZBqlcIhAQNBf8QE7qSyjUX0o3c6vXbTTQV89zNOXOGj9nRS8nBi4KQhgqk +bpwcTC+zg9QgJLZ9WLxeCTwbivUGguP04izH/cHPN1o1eDNRQpS0AquhR2bi6IQVqLlATgtW0xxZ +6FlZFxzFoR8luHIZZQeWu0/bDYEcRaC12tBn3nStt81cDbIdJS5zHBMnDJzQt4csSg9Ies+Upj/8 +Jfq9dlTf7GUm2d6oGakHNFJNOVTd/wiUvW9EJX0Aq/yQQg== """) ##file activate.ps1 From 6aa221447f205ba7ec0b51251dcf107317c25dfc Mon Sep 17 00:00:00 2001 From: Matt Iversen Date: Tue, 19 Jan 2016 18:25:35 +1100 Subject: [PATCH 3/5] Force CRLF for batch files --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..86c9df405 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +virtualenv_embedded/*.bat text eol=crlf \ No newline at end of file From 0268876db0983d93ff5a7626ec8e42463a5d903c Mon Sep 17 00:00:00 2001 From: Matt Iversen Date: Tue, 19 Jan 2016 18:26:08 +1100 Subject: [PATCH 4/5] Correct syntax and control logic flow --- virtualenv_embedded/activate.bat | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/virtualenv_embedded/activate.bat b/virtualenv_embedded/activate.bat index 5eed99ff4..ed42021cb 100644 --- a/virtualenv_embedded/activate.bat +++ b/virtualenv_embedded/activate.bat @@ -12,14 +12,19 @@ if defined _OLD_VIRTUAL_PROMPT ( set "PROMPT=__VIRTUAL_WINPROMPT__ %PROMPT%" REM Don't use () to avoid problems with them in %PATH% -if not defined _OLD_VIRTUAL_PYTHONHOME +if defined _OLD_VIRTUAL_PYTHONHOME goto ENDIFVHOME set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%" +:ENDIFVHOME set PYTHONHOME= -if defined _OLD_VIRTUAL_PATH +REM if defined _OLD_VIRTUAL_PATH ( +if not defined _OLD_VIRTUAL_PATH goto ENDIFVPATH1 set "PATH=%_OLD_VIRTUAL_PATH%" -if not defined _OLD_VIRTUAL_PATH +:ENDIFVPATH1 +REM ) else ( +if defined _OLD_VIRTUAL_PATH goto ENDIFVPATH2 set "_OLD_VIRTUAL_PATH=%PATH%" +:ENDIFVPATH2 set "PATH=%VIRTUAL_ENV%\__BIN_NAME__;%PATH%" From 583e80884989b0d201c1f013875bdc2f4c7b5338 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Tue, 19 Jan 2016 18:43:48 +1100 Subject: [PATCH 5/5] Apply in virtualenv.py --- virtualenv.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/virtualenv.py b/virtualenv.py index f04593f4d..7ba17726c 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -1928,11 +1928,12 @@ def convert(s): ##file activate.bat ACTIVATE_BAT = convert(""" -eJx9UmFrgzAQ/X6/4ggNm79hCHNUpqBRxHUMCkc7IwZaM2a2/v3GttPo2uZTcu/lvXeXPMvPRqOu -a+ikQbaKi/ItSCgUK5/IORExAFVjJWvVygopS5YDnhdZmpf4CGjXSedc8fkVGmfgodx18sK3oq02 -g/BEa663yBev7IR4o9cVD5+PXuAKjD29x+JcI8KRDUWY4lK3DwZ/+oQeGo2bX60q/PrW253cd3hQ -pkHTyD2q1l4NyojDrIlppI8yykSUpeGtzAPB5h72fZqe66B3XsCmcKZvT/PZ9zHZ/ZwTjX+Qzy8a -4Hg4P4SviV5iQSJIQ6KnP/YRdPeuHw== +eJx9Ul9LhEAQfxf8DoOclI/dYyFkaCmcq4gZQTBUrincuZFbff12T133TM+nnd35/Zvxlr7XDFhV +mUZHOVhFlOWP3g4DUriIWoVomYZpNBWUtGpaWgImO191pFkSpzlcmgaI70jVX7n2Qp8tuByg+46O +CMHbMq64T+nmlJt082D1T44muCDk2prgEHF4mdI9RaS/QwSt3zSyIAaftRccvqVTBziD1x/WlPD5 +xd729NDBb8Nr4DU9QNMKsJeH9pkhPedhQsIkDuCDCa6A+NF9IevVFAohkqizdHetg/tkWvPoftWJ +MCqnOxv7/x7Np6yv9P2Ker5dmX8yNyCkkWnbZy3N5LarczlqL8htx2EM9rQ/2H5BvIsIEi8OEG8U ++g8CsNTr """) ##file deactivate.bat