From ddb1f30d4f94f7fcd7ef00058a78e34b57e7b21e Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 21 Feb 2022 02:02:23 +0000 Subject: [PATCH] Refactor get_rocky() --- quickget | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickget b/quickget index c138689..1c9ef67 100755 --- a/quickget +++ b/quickget @@ -1124,17 +1124,17 @@ function get_zorin() { function get_rocky() { local HASH="" local ISO="" + local ISOTYPE="minimal" local URL="" - local arch="x86_64" - local baseurl="https://download.rockylinux.org/pub/rocky/${RELEASE}/isos/${arch}" - validate_release "releases_rockylinux" - ISO="Rocky-${RELEASE}-${arch}-${ISOTYPE}.iso" - URL="${baseurl}/${ISO}" - HASH=$(wget -q -O- "${baseurl}/CHECKSUM" | grep "SHA256 (${ISO})" | grep -E -i -w -o '[0-9a-z]{64}') - - web_get "${URL}" "${VM_PATH}" + if [ -n "${1}" ]; then + ISOTYPE="${1}" + fi + URL="https://download.rockylinux.org/pub/rocky/${RELEASE}/isos/x86_64" + ISO="Rocky-${RELEASE}-x86_64-${ISOTYPE}.iso" + HASH=$(wget -q -O- "${URL}/CHECKSUM" | grep "SHA256" | grep "${ISO}" | cut -d' ' -f4) + web_get "${URL}/${ISO}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" }