diff options
| author | Matthew Iversen <teh.ivo@gmail.com> | 2016-01-19 17:45:59 +1100 |
|---|---|---|
| committer | Matthew Iversen <teh.ivo@gmail.com> | 2016-01-19 17:45:59 +1100 |
| commit | 227a511d67ad66418b2f73ddce748e886d5322a4 (patch) | |
| tree | 5fa75bd95d577a8b18105277e842a70f76df52ff | |
| parent | fc136ebeec16cd68d2ca630c1687f1106cc507d6 (diff) | |
| download | virtualenv-227a511d67ad66418b2f73ddce748e886d5322a4.tar.gz | |
Remove some brackets in bat, solves #35
| -rw-r--r-- | docs/changes.rst | 2 | ||||
| -rw-r--r-- | virtualenv_embedded/activate.bat | 51 | ||||
| -rw-r--r-- | virtualenv_embedded/deactivate.bat | 19 |
3 files changed, 36 insertions, 36 deletions
diff --git a/docs/changes.rst b/docs/changes.rst index d5495c4..114dab7 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 4c2003e..5eed99f 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 fd4db26..7bbc568 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 |