diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2023-05-07 20:32:26 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2023-05-15 19:47:32 -0700 |
| commit | 93cc43832a3923259951928d88e6a5a0c62078c3 (patch) | |
| tree | f892785287022a63c73c97ec17ef4a40ca4a8355 /tools/buildsteps/windows | |
| parent | 7d0690f7c66e33a1cd8ede1a4ffb73da54123b66 (diff) | |
[windows] use curl instead of wget to download dependencies
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
Diffstat (limited to 'tools/buildsteps/windows')
| -rw-r--r-- | tools/buildsteps/windows/buildhelpers.sh | 4 | ||||
| -rw-r--r-- | tools/buildsteps/windows/download-dependencies.bat | 1 | ||||
| -rw-r--r-- | tools/buildsteps/windows/download-msys2.bat | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tools/buildsteps/windows/buildhelpers.sh b/tools/buildsteps/windows/buildhelpers.sh index a00fbd2c99..c06fee0747 100644 --- a/tools/buildsteps/windows/buildhelpers.sh +++ b/tools/buildsteps/windows/buildhelpers.sh @@ -37,9 +37,9 @@ do_wget() { local archive="$2" if [[ -z $archive ]]; then - wget --tries=5 --retry-connrefused --waitretry=2 --no-check-certificate -c -P /downloads/ $URL + curl --retry 5 --retry-all-errors --retry-connrefused --retry-delay 5 --location --output-dir /downloads/ --remote-name $URL else - wget --tries=5 --retry-connrefused --waitretry=2 --no-check-certificate -c $URL -O /downloads/$archive + curl --retry 5 --retry-all-errors --retry-connrefused --retry-delay 5 --location --output-dir /downloads/ --output $archive $URL fi } diff --git a/tools/buildsteps/windows/download-dependencies.bat b/tools/buildsteps/windows/download-dependencies.bat index 0a129fd76f..f6c4386cd7 100644 --- a/tools/buildsteps/windows/download-dependencies.bat +++ b/tools/buildsteps/windows/download-dependencies.bat @@ -31,7 +31,6 @@ REM Can't run rmdir and md back to back. access denied error otherwise. IF EXIST %TMP_PATH% rmdir %TMP_PATH% /S /Q SET DL_PATH="%BUILD_DEPS_PATH%\downloads" -SET WGET=%BUILD_DEPS_PATH%\bin\wget SET ZIP=%BUILD_DEPS_PATH%\..\Win32BuildSetup\tools\7z\7za IF NOT EXIST %DL_PATH% md %DL_PATH% diff --git a/tools/buildsteps/windows/download-msys2.bat b/tools/buildsteps/windows/download-msys2.bat index 34c34729a7..bef200ceec 100644 --- a/tools/buildsteps/windows/download-msys2.bat +++ b/tools/buildsteps/windows/download-msys2.bat @@ -84,7 +84,7 @@ if exist "%downloaddir%\%msysfile%" GOTO unpack ::download msys2 from our mirror set msysurl=%MSYS_MIRROR%/%msysfile% ) - %instdir%\bin\wget --tries=20 --retry-connrefused --waitretry=2 --no-check-certificate -c -O %downloaddir%\%msysfile% %msysurl% + curl --retry 5 --retry-all-errors --retry-connrefused --retry-delay 5 --location --output %downloaddir%\%msysfile% %msysurl% if errorlevel == 1 ( if exist "%downloaddir%\%msysfile%" del %downloaddir%\%msysfile% if %usemirror%==yes ( @@ -383,7 +383,7 @@ if exist %downloaddir%\%gaspreprocfile% goto extractGasPreproc echo ------------------------------------------------------------------------------- echo.- Downloading gas-preprocessor.pl echo ------------------------------------------------------------------------------- - %instdir%\bin\wget --tries=20 --retry-connrefused --waitretry=2 --no-check-certificate -c -O %downloaddir%\%gaspreprocfile% %gaspreprocurl% + curl --retry 5 --retry-all-errors --retry-connrefused --retry-delay 5 --location --output %downloaddir%\%gaspreprocfile% %gaspreprocurl% :extractGasPreproc if exist %instdir%\%msys2%\usr\bin\gas-preprocessor.pl goto end |