Index: bootstrap/win/win_tools.bat |
=================================================================== |
--- bootstrap/win/win_tools.bat (revision 166792) |
+++ bootstrap/win/win_tools.bat (working copy) |
@@ -25,14 +25,20 @@ |
:GIT_CHECK |
:: If the batch file exists, skip the git check. |
-if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" goto :MSYS_TERM_CHECK |
-if "%CHROME_HEADLESS%" == "1" goto :MSYS_TERM_CHECK |
+if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" goto :MSYS_PATH_CHECK |
+if "%CHROME_HEADLESS%" == "1" goto :SVN_CHECK |
if "%WIN_TOOLS_FORCE%" == "1" goto :GIT_INSTALL |
call git --version 2>nul 1>nul |
if errorlevel 1 goto :GIT_INSTALL |
-goto :MSYS_TERM_CHECK |
+goto :SVN_CHECK |
+:MSYS_PATH_CHECK |
+call find "mingw" "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" 2>nul 1>nul |
+if errorlevel 1 goto :SVN_CHECK |
+rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" |
+ |
+ |
:GIT_INSTALL |
echo Installing git (avg 1-2 min download) ... |
:: git is not accessible; check it out and create 'proxy' files. |
@@ -54,7 +60,7 @@ |
:: Ensure autocrlf and filemode are set correctly. |
call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.autocrlf false |
call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.filemode false |
-goto :MSYS_TERM_CHECK |
+goto :SVN_CHECK |
:GIT_FAIL |
@@ -66,17 +72,6 @@ |
goto :END |
-:MSYS_TERM_CHECK |
-:: Tweak git.bat to set TERM appropriately |
-call FIND "TERM" "%WIN_TOOLS_ROOT_DIR%\git.bat" 2>nul 1>nul |
-IF errorlevel 1 ( |
- FINDSTR /V "git\.cmd" "%WIN_TOOLS_ROOT_DIR%\git.bat" > git.bat.new |
- echo set TERM=msys >> git.bat.new |
- FINDSTR "git\.cmd" "%WIN_TOOLS_ROOT_DIR%\git.bat" >> git.bat.new |
- MOVE /Y git.bat.new "%WIN_TOOLS_ROOT_DIR%\git.bat" >nul |
-) |
- |
- |
:SVN_CHECK |
:: If the batch file exists, skip the svn check. |
if exist "%WIN_TOOLS_ROOT_DIR%\svn.bat" goto :PYTHON_CHECK |