Issue #17743: Now use extended syntax of set command in .bat files.

diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index c45e65a26f51c66788d4eb55e505cca3624d29b7..3cebe263818b3f20f6d15cc763402d68cd427109 100644 (file)
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -1,31 +1,32 @@
 @echo off\r
-set VIRTUAL_ENV=__VENV_DIR__\r
+set "VIRTUAL_ENV=__VENV_DIR__"\r
 \r
 if not defined PROMPT (\r
-    set PROMPT=$P$G\r
+    set "PROMPT=$P$G"\r
 )\r
 \r
 if defined _OLD_VIRTUAL_PROMPT (\r
-    set PROMPT=%_OLD_VIRTUAL_PROMPT%\r
+    set "PROMPT=%_OLD_VIRTUAL_PROMPT%"\r
 )\r
 \r
 if defined _OLD_VIRTUAL_PYTHONHOME (\r
-     set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%\r
+    set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"\r
 )\r
 \r
-set _OLD_VIRTUAL_PROMPT=%PROMPT%\r
-set PROMPT=__VENV_NAME__%PROMPT%\r
+set "_OLD_VIRTUAL_PROMPT=%PROMPT%"\r
+set "PROMPT=__VENV_NAME__%PROMPT%"\r
 \r
 if defined PYTHONHOME (\r
-     set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%\r
-     set PYTHONHOME=\r
+    set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%"\r
+    set PYTHONHOME=\r
 )\r
 \r
-if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%; goto SKIPPATH\r
-\r
-set _OLD_VIRTUAL_PATH=%PATH%\r
+if defined _OLD_VIRTUAL_PATH (\r
+    set "PATH=%_OLD_VIRTUAL_PATH%"\r
+) else (\r
+    set "_OLD_VIRTUAL_PATH=%PATH%"\r
+)\r
 \r
-:SKIPPATH\r
-set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%\r
+set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"\r
 \r
 :END\r