From ca874447901b7bc75551e4df51e105ac66d84af1 Mon Sep 17 00:00:00 2001 From: Mocker Date: Mon, 18 Mar 2024 14:38:34 -0700 Subject: [PATCH 1/2] Work around broken parsing in zulu.bash There are some entries in the Azul archive that the script does not expect, they are for "JDKs" like `zre9.0.0.15-jre9.0.0-macosx_x64.dmg`. This eventually causes a fatal error, which prevents the script from completing and updating files like `all.json`. This fix just ignores lines that include `zre`. --- bin/zulu.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/zulu.bash b/bin/zulu.bash index bf68cab0a72..a9bb9bce20c 100755 --- a/bin/zulu.bash +++ b/bin/zulu.bash @@ -63,7 +63,10 @@ do METADATA_FILE="${METADATA_DIR}/${ZULU_FILE}.json" ZULU_ARCHIVE="${TEMP_DIR}/${ZULU_FILE}" ZULU_URL="https://static.azul.com/zulu/bin/${ZULU_FILE}" - if [[ -f "${METADATA_FILE}" ]] + if [[ "${ZULU_FILE}" == *"zre"* ]] + then + echo "Ignoring ${ZULU_FILE}" + elif [[ -f "${METADATA_FILE}" ]] then echo "Skipping ${ZULU_FILE}" else From db3695753b5cd2c3df3024c934dddda2622dfc04 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 18 Mar 2024 23:06:55 +0100 Subject: [PATCH 2/2] Tabs vs. spaces --- bin/zulu.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/zulu.bash b/bin/zulu.bash index a9bb9bce20c..67f09fc2556 100755 --- a/bin/zulu.bash +++ b/bin/zulu.bash @@ -65,7 +65,7 @@ do ZULU_URL="https://static.azul.com/zulu/bin/${ZULU_FILE}" if [[ "${ZULU_FILE}" == *"zre"* ]] then - echo "Ignoring ${ZULU_FILE}" + echo "Ignoring ${ZULU_FILE}" elif [[ -f "${METADATA_FILE}" ]] then echo "Skipping ${ZULU_FILE}"