Bugfix eclipse download

toolarium · Dec 12, 2023 · 152935e · 152935e
1 parent 51d96c6
commit 152935e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 major.number        = 0
 minor.number        = 9
-revision.number     = 44
+revision.number     = 45
 qualifier           =
diff --git a/bin/packages/eclipse/eclipse.bat b/bin/packages/eclipse/eclipse.bat
@@ -53,8 +53,11 @@ powershell -command "$json = (Get-Content "%TMPFILE%" -Raw) | ConvertFrom-Json;
 set /p CB_ECLIPSE_RELEASE_VERSION= < "%CB_ECLIPSE_JSON_INFO%"
 powershell -command "$json = (Get-Content "%TMPFILE%" -Raw) | ConvertFrom-Json; $json.packages.$Env:CB_ECLIPSE_PACKAGE_NAME.files.windows.$Env:CB_PROCESSOR_ARCHITECTURE_NUMBER.url" > "%CB_ECLIPSE_JSON_INFO%"
 set /p CB_PACKAGE_DOWNLOAD_URL= < "%CB_ECLIPSE_JSON_INFO%"
-
 set "CB_PACKAGE_DOWNLOAD_NAME=%CB_PACKAGE_DOWNLOAD_URL%"
+
+:: change 2023/12/12 add r=1
+set "CB_PACKAGE_DOWNLOAD_URL=%CB_PACKAGE_DOWNLOAD_URL%&r=1"
+
 :PREPARE_PACKAGE_NAME
 for /f "tokens=1 delims=/" %%G in ("%CB_PACKAGE_DOWNLOAD_NAME%") do (set "CB_PACKAGE_DOWNLOAD_NAME=%CB_PACKAGE_DOWNLOAD_NAME:*/=%")
 echo %CB_PACKAGE_DOWNLOAD_NAME% | findstr /C:"/" >NUL && (goto :PREPARE_PACKAGE_NAME) 

diff --git a/bin/packages/eclipse/eclipse.sh b/bin/packages/eclipse/eclipse.sh
@@ -51,6 +51,10 @@ CB_PACKAGE_VERSION_NAME=$(cat "$CB_ECLIPSE_JSON_INFO" | $CB_BIN/cb-json --value
 CB_PACKAGE_DOWNLOAD_URL=$(eval "cat \"$CB_ECLIPSE_JSON_INFO\" | $CB_BIN/cb-json --value --name packages.${CB_ECLIPSE_PACKAGE_NAME}.files.${CB_ECLIPSE_OS}.${CB_PROCESSOR_ARCHITECTURE_NUMBER}.url" | tr -d '\r')
 
 CB_PACKAGE_DOWNLOAD_NAME="${CB_PACKAGE_DOWNLOAD_URL##*/}"
+
+# change 2023/12/12 add r=1
+CB_PACKAGE_DOWNLOAD_URL="${CB_PACKAGE_DOWNLOAD_URL}&r=1"
+
 mv "$CB_ECLIPSE_JSON_INFO" "$CB_DEV_REPOSITORY/${CB_PACKAGE_DOWNLOAD_NAME}.json" >/dev/null 2>&1
 
 CB_PACKAGE_DEST_VERSION_NAME="eclipse-$CB_PACKAGE_VERSION_NAME"