diff --git a/update_depot_tools.bat b/update_depot_tools.bat index b4d6b26ba..a35156115 100644 --- a/update_depot_tools.bat +++ b/update_depot_tools.bat @@ -34,16 +34,13 @@ IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF echo Updating depot_tools... -:: Download git for the first time if it's not present. +:: Test git is installed by checking its version. call git --version > nul 2>&1 -if %ERRORLEVEL% == 0 goto :GIT_UPDATE -call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat" -if errorlevel 1 ( - echo Error updating depot_tools, no revision tool found. +if %ERRORLEVEL% NEQ 0 ( + echo Git isn't installed. Please install it. exit /b %ERRORLEVEL% ) -:GIT_UPDATE :: Now clear errorlevel so it can be set by other programs later. set errorlevel= @@ -65,5 +62,5 @@ if errorlevel 1 ( :: Sync CIPD and CIPD client tools. call "%~dp0\cipd_bin_setup.bat" -:: Update git and python. +:: Update python. call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"