From 9c0d446de626b86b92fd40cca59f2a145b616c33 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Sun, 28 Apr 2024 02:44:44 +0100 Subject: [PATCH] refactor: use sub-shell in list_url_all() to test ubuntu, skip mac and windows --- quickget | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/quickget b/quickget index 7d29e4b..791ae61 100755 --- a/quickget +++ b/quickget @@ -413,6 +413,7 @@ function list_url_all() { else FUNC="${OS}" fi + for RELEASE in $("releases_${FUNC}" | sed -Ee 's/eol-\S+//g' ); do # hide eol releases if [[ $(type -t "editions_${OS}") == function ]]; then for EDITION in $(editions_"${OS}"); do @@ -423,23 +424,22 @@ function list_url_all() { elif [[ "${OS}" == "windows"* ]]; then "languages_${OS}" for OPTION in "${LANGS[@]}"; do - echo "skipped: ${OS} ${RELEASE} ${OPTION}" - #validate_release releases_${OS} - #get_${OS} ${OPTION} | cut_1 + validate_release releases_"${OS}" + echo -e "SKIP:\t${OS}\t${RELEASE}\t${OPTION}\t${URL}" done - #TODO NEEDED? elif [[ "${OS}" == "macos" ]]; then validate_release releases_"${OS}" - get_macos || echo "FAIL - ${OS} ${RELEASE} ${OPTION}" + echo -e "SKIP:\t${OS}\t${RELEASE}" elif [[ "${OS}" == *ubuntu-server* ]]; then - validate_release releases_ubuntu - get_ubuntu-server || echo "FAIL - ${OS} ${RELEASE}" + validate_release releases_ubuntu-server + (get_ubuntu-server) elif [[ "${OS}" == *ubuntu* ]]; then validate_release releases_ubuntu - get_ubuntu || echo "FAIL - ${OS} ${RELEASE}" + (get_ubuntu) else validate_release releases_"${OS}" - get_"${OS}" "${RELEASE}" | cut_1 || echo "FAIL - ${OS} ${RELEASE}" + URL=$(get_"${OS}" | cut_1 | head -1) + echo "${URL}" fi done exit 0