From 7f12a2e47b699e72d601d458d5401b1f63b63275 Mon Sep 17 00:00:00 2001 From: Dan Jacques Date: Thu, 20 Jul 2017 11:43:54 -0700 Subject: [PATCH] [bootstrap/win] Roll bleeding edge entry bat. Roll the bleeding-edge entry batch file into production. This follows successful tested deployment of the batch file on canary systems. BUG=chromium:746602 TEST=canary R=iannucci@chromium.org, smut@chromium.org, vadimsh@chromium.org Change-Id: Iaee2a9b4d178ffff3da9a73f4538465bb5367e84 Reviewed-on: https://chromium-review.googlesource.com/580307 Reviewed-by: Vadim Shtayura Reviewed-by: Robbie Iannucci Commit-Queue: Daniel Jacques --- bootstrap/win/python27.new.bat | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bootstrap/win/python27.new.bat b/bootstrap/win/python27.new.bat index 53d2802a8..86aba8933 100644 --- a/bootstrap/win/python27.new.bat +++ b/bootstrap/win/python27.new.bat @@ -11,9 +11,6 @@ set PYTHON_BAT_RUNNER=1 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: This file is automatically generated by "bootstrap\win\win_tools.py", and :: should not be modified. @@ -33,7 +30,7 @@ set PYTHON_BAT_RUNNER=1 :: it set. :: :: We remedy this in the future by having the batch file load its core paths -:: from an external file via "set /p", removing the need to modify "python.bat" +:: from an external file with for/set, removing the need to modify "python.bat" :: during upgrade. :: :: After all of the old batch files are believed to be replaced, we can remove @@ -42,7 +39,7 @@ set PYTHON_BAT_RUNNER=1 if not "%PYTHON_BAT_RUNNER%" == "1" goto :END -set /p PYTHON_BIN_RELDIR=<%~dp0python_bin_reldir.txt +for /f %%i in (%~dp0python_bin_reldir.txt) do set PYTHON_BIN_RELDIR=%%i set PATH=%~dp0%PYTHON_BIN_RELDIR%;%~dp0%PYTHON_BIN_RELDIR%\Scripts;%PATH% "%~dp0%PYTHON_BIN_RELDIR%\python.exe" %*