From d7fd4df03e06feb99b900704a1a12c8e463593bb Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Fri, 29 Oct 2021 09:50:23 +0100 Subject: [PATCH] Fix index reference for Windows 11. Close #171 --- quickget | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index d335d59..07e0a6c 100755 --- a/quickget +++ b/quickget @@ -903,6 +903,7 @@ function get_ubuntu() { # Adapted from https://gist.github.com/hongkongkiwi/15a5bf16437315df256c118c163607cb function get_windows() { local ARCH="x64" + local INDEX=0 local LANG_CODE="en" local LATEST_WINDOWS_VERSION="" local WINDOWS_NAME="" @@ -917,9 +918,14 @@ function get_windows() { validate_release "releases_windows" + # Ignore the most recent Windows 10 release for now. + if [ ${RELEASE} -eq 10 ]; then + INDEX=1 + fi + echo "Getting Windows ${RELEASE} URL..." WINDOWS_VERSIONS=$(wget -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))') - LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '${RELEASE}'")))[1]') + LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '${RELEASE}'")))['${INDEX}']') WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name) VERSION_ID=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .version_id)