From c553e404c9df6b9b83e46d25bd787bc608835732 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 10:55:29 +0000 Subject: [PATCH] Refactor get_oraclelinux() to add create_vm() compatibility --- quickget | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/quickget b/quickget index e2bc6ec..ac8a7a3 100755 --- a/quickget +++ b/quickget @@ -1048,22 +1048,16 @@ function get_opensuse() { function get_oraclelinux() { local HASH="" local ISO="" - local URL="" - local VER_MAJ="" - local VER_MIN="" - - VER_MAJ=${RELEASE::1} - VER_MIN=${RELEASE:2:1} - URL="https://yum.oracle.com/ISOS/OracleLinux/OL${VER_MAJ}/u${VER_MIN}/x86_64/" - if [ "${VER_MAJ}" == "8" ]; then - ISO="OracleLinux-R${VER_MAJ}-U${VER_MIN}-x86_64-dvd.iso" - else - ISO="OracleLinux-R${VER_MAJ}-U${VER_MIN}-Server-x86_64-dvd.iso" - fi + local VER_MAJ=${RELEASE::1} + local VER_MIN=${RELEASE:2:1} + local URL="https://yum.oracle.com/ISOS/OracleLinux/OL${VER_MAJ}/u${VER_MIN}/x86_64/" + + case ${VER_MAJ} in + 8) ISO="OracleLinux-R${VER_MAJ}-U${VER_MIN}-x86_64-dvd.iso";; + *) ISO="OracleLinux-R${VER_MAJ}-U${VER_MIN}-Server-x86_64-dvd.iso";; + esac HASH=$(wget -q -O- "https://linux.oracle.com/security/gpg/checksum/OracleLinux-R${VER_MAJ}-U${VER_MIN}-Server-x86_64.checksum" | grep "${ISO}" | cut -d' ' -f1) - web_get "${URL}/${ISO}" "${VM_PATH}" - check_hash "${ISO}" "${HASH}" - make_vm_config "${ISO}" + echo "${URL}/${ISO} ${HASH}" } function get_popos() {