From f3d7dd080d82097ee73b950133331a23ab377ec9 Mon Sep 17 00:00:00 2001 From: Ruben Abad Date: Sun, 28 Jan 2024 21:57:34 +0100 Subject: [PATCH] Access files through https --- Update.bat | 2 +- Update.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Update.bat b/Update.bat index 30a6ccb52..9554933c0 100644 --- a/Update.bat +++ b/Update.bat @@ -19,7 +19,7 @@ for /F "delims=" %%a in (%CONTENT_VERSIONS%) do ( set "lastLine=%%a" ) set CONTENT_ID=%lastLine:~-16,16% -set CONTENT_LINK=http://carla-assets.s3.us-east-005.backblazeb2.com/%CONTENT_ID%.tar.gz +set CONTENT_LINK=https://carla-assets.s3.us-east-005.backblazeb2.com/%CONTENT_ID%.tar.gz if "%CONTENT_ID:~0,2%"=="20" ( set CONTENT_FILE=%CONTENT_FOLDER%/%CONTENT_ID%.tar.gz set CONTENT_FILE_TAR=%CONTENT_FOLDER%/%CONTENT_ID%.tar diff --git a/Update.sh b/Update.sh index 58d8a1999..d6a5c0192 100755 --- a/Update.sh +++ b/Update.sh @@ -41,13 +41,16 @@ done # -- Set up environment -------------------------------------------------------- # ============================================================================== +MAX_PARALLELL_DOWNLOADS=1 +MAX_CONNECTIONS_PER_SERVER=1 + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pushd "$SCRIPT_DIR" >/dev/null CONTENT_FOLDER="${SCRIPT_DIR}/Unreal/CarlaUE4/Content/Carla" CONTENT_ID=$(tac $SCRIPT_DIR/Util/ContentVersions.txt | egrep -m 1 . | rev | cut -d' ' -f1 | rev) -CONTENT_LINK=http://carla-assets.s3.us-east-005.backblazeb2.com/${CONTENT_ID}.tar.gz +CONTENT_LINK=https://carla-assets.s3.us-east-005.backblazeb2.com/${CONTENT_ID}.tar.gz VERSION_FILE="${CONTENT_FOLDER}/.version" @@ -60,7 +63,7 @@ function download_content { mkdir -p Content if hash aria2c 2>/dev/null; then echo -e "${CONTENT_LINK}\n\tout=Content.tar.gz" > .aria2c.input - aria2c -j16 -x16 --input-file=.aria2c.input + aria2c -j${MAX_PARALLELL_DOWNLOADS} -x${MAX_CONNECTIONS_PER_SERVER} --input-file=.aria2c.input rm -f .aria2c.input else wget -c ${CONTENT_LINK} -O Content.tar.gz