Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4464)

Unified Diff: bootstrap/win/win_tools.bat

Issue 1845493003: Make git binary tools auto update on mingw (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | update_depot_tools » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bootstrap/win/win_tools.bat
diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
index 55f85cef9541bb312614fd80cfc1b18a5e3ae255..48b038d65ebc8c428441531c9acc7584fd28ed0e 100644
--- a/bootstrap/win/win_tools.bat
+++ b/bootstrap/win/win_tools.bat
@@ -64,8 +64,12 @@ for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VER
if %VERMAJOR% lss 5 set GIT_VERSION=%GIT_VERSION%-xp
if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set XP_SUFFIX=-xp
+:: must explicitly use FIND_EXE to prevent this from grabbing e.g. gnuwin32 or
+:: msys versions.
+set FIND_EXE=%SYSTEMROOT%\System32\find.exe
+
:: Check to see if we're on a 32 or 64 bit system
-reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS_BITS=32 || set OS_BITS=64
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | %FIND_EXE% /i "x86" > NUL && set OS_BITS=32 || set OS_BITS=64
if not exist "%WIN_TOOLS_ROOT_DIR%\.git_bleeding_edge" goto :GIT_OLD_FLOW
set GIT_PORTABLE_FLOW=1
« no previous file with comments | « no previous file | update_depot_tools » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698