Commit 574b324b authored by Steve Dower's avatar Steve Dower Committed by Zachary Ware

bpo-36634: Fixes activate.bat when existing values contain double quotes (GH-15924)

parent 6357c957
...@@ -2,44 +2,32 @@ ...@@ -2,44 +2,32 @@
rem This file is UTF-8 encoded, so we need to update the current code page while executing it rem This file is UTF-8 encoded, so we need to update the current code page while executing it
for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do ( for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
set "_OLD_CODEPAGE=%%a" set _OLD_CODEPAGE=%%a
) )
if defined _OLD_CODEPAGE ( if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul "%SystemRoot%\System32\chcp.com" 65001 > nul
) )
set "VIRTUAL_ENV=__VENV_DIR__" set VIRTUAL_ENV=__VENV_DIR__
if not defined PROMPT ( if not defined PROMPT set PROMPT=$P$G
set "PROMPT=$P$G"
)
if defined _OLD_VIRTUAL_PROMPT (
set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
)
if defined _OLD_VIRTUAL_PYTHONHOME ( if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%" if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
)
set "_OLD_VIRTUAL_PROMPT=%PROMPT%" set _OLD_VIRTUAL_PROMPT=%PROMPT%
set "PROMPT=__VENV_PROMPT__%PROMPT%" set PROMPT=__VENV_PROMPT__%PROMPT%
if defined PYTHONHOME ( if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%" set PYTHONHOME=
set PYTHONHOME=
)
if defined _OLD_VIRTUAL_PATH ( if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
set "PATH=%_OLD_VIRTUAL_PATH%" else set _OLD_VIRTUAL_PATH=%PATH%
) else (
set "_OLD_VIRTUAL_PATH=%PATH%"
)
set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%" set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%
:END :END
if defined _OLD_CODEPAGE ( if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
set "_OLD_CODEPAGE=" set _OLD_CODEPAGE=
) )
venv activate.bat now works when the existing variables contain double quote
characters.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment