diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat index d423ee58c..17844d2ff 100644 --- a/bootstrap/win/win_tools.bat +++ b/bootstrap/win/win_tools.bat @@ -58,7 +58,7 @@ set WIN_TOOLS_EXTRA_ARGS=%WIN_TOOLS_EXTRA_ARGS% --win-tools-name "%WIN_TOOLS_NAM :: Install our CIPD packages. The CIPD client self-bootstraps. :: See "//cipd.bat" and "//cipd.ps1" for more information. set CIPD_EXE=%WIN_TOOLS_ROOT_DIR%\cipd.bat -call "%CIPD_EXE%" ensure -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%" +call "%CIPD_EXE%" ensure -log-level warning -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%" if errorlevel 1 goto :END :: This executes "win_tools.py" using the bundle's Python interpreter. diff --git a/cipd b/cipd index fc8de1a9e..ef2e4ad5b 100755 --- a/cipd +++ b/cipd @@ -49,8 +49,7 @@ CLIENT="$MYPATH/.cipd_client" USER_AGENT="depot_tools/$(git -C $MYPATH rev-parse HEAD 2>/dev/null || echo "???")" if [ ! -e "$CLIENT" ]; then - echo "Bootstrapping cipd client for ${PLAT}-${ARCH}..." - echo "From $URL" + echo "Bootstrapping cipd client for ${PLAT}-${ARCH} from ${URL}..." if hash curl 2> /dev/null ; then # Download the client into a temporary file, then move it into the final # location atomically. @@ -60,7 +59,7 @@ if [ ! -e "$CLIENT" ]; then mktemp -p "$MYPATH" 2>/dev/null || \ mktemp "$MYPATH/.cipd_client.XXXXXXX") - curl "$URL" -f -A "$USER_AGENT" -L -o "$CIPD_CLIENT_TMP" + curl "$URL" -s --show-error -f -A "$USER_AGENT" -L -o "$CIPD_CLIENT_TMP" chmod +x "$CIPD_CLIENT_TMP" set +e diff --git a/cipd.ps1 b/cipd.ps1 index 78efcd635..f365ea127 100644 --- a/cipd.ps1 +++ b/cipd.ps1 @@ -49,12 +49,8 @@ while ($true) { $cipd_lock_file = [IO.File]::OpenWrite($cipd_lock) if (!(Test-Path $client)) { - echo "Bootstrapping cipd client for $plat-$arch..." - echo "From $url" + echo "Bootstrapping cipd client for $plat-$arch from $url..." - # TODO(iannucci): It would be really nice if there was a way to get this to - # show progress without also completely destroying the download speed, but - # I can't seem to find a way to do it. Patches welcome :) $wc = (New-Object System.Net.WebClient) $wc.Headers.add('User-Agent', $user_agent) $wc.DownloadFile($url, $client) @@ -68,4 +64,4 @@ while ($true) { $cipd_lock_file.close() } } -} \ No newline at end of file +} diff --git a/cipd_bin_setup.bat b/cipd_bin_setup.bat index 04c698c16..11350cdea 100644 --- a/cipd_bin_setup.bat +++ b/cipd_bin_setup.bat @@ -3,4 +3,4 @@ :: Use of this source code is governed by a BSD-style license that can be :: found in the LICENSE file. -"%~dp0\cipd.bat" ensure -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin" +"%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin" diff --git a/cipd_bin_setup.sh b/cipd_bin_setup.sh index 61dfb7af6..aadf048dd 100644 --- a/cipd_bin_setup.sh +++ b/cipd_bin_setup.sh @@ -5,6 +5,8 @@ function cipd_bin_setup { local MYPATH=$(dirname "${BASH_SOURCE[0]}") - "$MYPATH/cipd" ensure -ensure-file "$MYPATH/cipd_manifest.txt" \ + "$MYPATH/cipd" ensure \ + -log-level warning \ + -ensure-file "$MYPATH/cipd_manifest.txt" \ -root "$MYPATH/.cipd_bin" } diff --git a/cipd_client_version b/cipd_client_version index 97d68d497..fdb6a9ef6 100644 --- a/cipd_client_version +++ b/cipd_client_version @@ -1 +1 @@ -git_revision:5cf65fdf804a9b3f3023f79d5b3cab2a88ccd09e +git_revision:b482bfa19d3fa79b4b40dd5ac7a34479052e3df1