diff --git a/quickget b/quickget index 49b3ee7..58b7016 100755 --- a/quickget +++ b/quickget @@ -266,11 +266,11 @@ function editions_android() { echo x86 x86_64 } -function releases_archlinux() { +function releases_archcraft() { echo latest } -function releases_archcraft() { +function releases_archlinux() { echo latest } @@ -282,6 +282,10 @@ function editions_arcolinux() { echo large small } +function releases_batocera() { + echo 32 33 34 +} + function releases_blendos() { local RLIST RLIST=$(curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep tag_name | grep -o -E '[[:digit:]]+\.[[:digit:]]+' | tr ' \r\n' ' ') @@ -362,10 +366,6 @@ function releases_fedora() { echo 33 34 35 36 37 38 } -function releases_batocera() { - echo 32 33 34 -} - function editions_fedora() { echo Workstation \ Budgie \ @@ -457,6 +457,10 @@ function releases_lmde(){ echo 5 } +function releases_macos() { + echo high-sierra mojave catalina big-sur monterey ventura +} + function releases_mageia(){ echo 8 } @@ -465,18 +469,6 @@ function editions_mageia(){ echo Plasma GNOME Xfce } -function releases_mxlinux(){ - echo 21.3 -} - -function editions_mxlinux(){ - echo Xfce KDE Fluxbox -} - -function releases_macos() { - echo high-sierra mojave catalina big-sur monterey ventura -} - function releases_manjaro() { echo xfce \ gnome \ @@ -487,6 +479,14 @@ function releases_manjaro() { mate } +function releases_mxlinux(){ + echo 21.3 +} + +function editions_mxlinux(){ + echo Xfce KDE Fluxbox +} + function releases_netboot() { echo latest } @@ -541,12 +541,6 @@ function releases_rebornos() { echo latest } -function get_rebornos() { - local ISO=$(curl -s 'https://www.rebornos.org/download/' | grep -ohE 'https://pub-cb7a4d4f7a974896b3bf40c52d1defbc.r2.dev/RebornOS-ISO/(rebornos_xfce_minimal|rebornos_iso)-[0-9]{4}.[0-9]{2}.[0-9]{2}-x86_64.iso' | tail -n1) - local HASH=$(curl -s 'https://www.rebornos.org/download/' | grep -ozP 'Checksum MD5:.*[0-9a-fA-F]{32}' | grep -zoP '[0-9a-fA-F]{32}' | cut -d '' -f1) - echo "${ISO} ${HASH}" -} - function releases_rockylinux() { echo 8.3 8.4 8.5 8.6 8.7 9.0 9.1 } @@ -1014,15 +1008,6 @@ function get_android() { echo "${URL}/${ISO} ${HASH}" } -function get_archlinux() { - local HASH="" - local ISO="" - local URL="https://mirror.rackspace.com/archlinux" - ISO=$(wget -q -O- "https://archlinux.org/releng/releases/json/" | jq -r '.releases[0].iso_url') - HASH=$(wget -q -O- "https://archlinux.org/releng/releases/json/" | jq -r '.releases[0].sha1_sum') - echo "${URL}/${ISO} ${HASH}" -} - function get_archcraft() { local HASH="" local URL="" @@ -1033,6 +1018,15 @@ function get_archcraft() { echo "${URL} ${HASH}" } +function get_archlinux() { + local HASH="" + local ISO="" + local URL="https://mirror.rackspace.com/archlinux" + ISO=$(wget -q -O- "https://archlinux.org/releng/releases/json/" | jq -r '.releases[0].iso_url') + HASH=$(wget -q -O- "https://archlinux.org/releng/releases/json/" | jq -r '.releases[0].sha1_sum') + echo "${URL}/${ISO} ${HASH}" +} + function get_arcolinux() { local EDITION="${1:-}" local HASH="" @@ -1042,6 +1036,25 @@ function get_arcolinux() { echo "${URL}/${ISO} ${HASH}" } +function get_batocera() { + local HASH="" + local URL="https://mirrors.o2switch.fr/batocera/x86_64/stable/last" + local ISO="$(curl -sl ${URL}/ | grep -e 'batocera.*img.gz'|cut -d\" -f2)" + local CURRENT_RELEASE=$(echo "${ISO}"| cut -d\- -f3) + + case ${RELEASE} in + ${CURRENT_RELEASE}) #Current release + URL+="" + ;; + *) + URL+="/archives/${RELEASE}" + ISO="$(curl -sl ${URL}/ | grep -e 'batocera.*img.gz'|cut -d\" -f2)" + ;; # non-current are here + esac + + echo "${URL}/${ISO} ${HASH}" +} + function get_blendos() { local EDITION="${1:-}" local HASH="" @@ -1081,28 +1094,6 @@ function get_vanillaos() { echo "${URL} ${HASH}" } -function get_batocera() { - local HASH="" - local URL="https://mirrors.o2switch.fr/batocera/x86_64/stable/last" - local ISO="$(curl -sl ${URL}/ | grep -e 'batocera.*img.gz'|cut -d\" -f2)" - local CURRENT_RELEASE=$(echo "${ISO}"| cut -d\- -f3) - - - case ${RELEASE} in - ${CURRENT_RELEASE}) #Current release - URL+="" - ;; - *) - URL+="/archives/${RELEASE}" - ISO="$(curl -sl ${URL}/ | grep -e 'batocera.*img.gz'|cut -d\" -f2)" - ;; # non-current are here - - esac - - - echo "${URL}/${ISO} ${HASH}" -} - function get_cachyos() { local HASH="" local ISO="cachyos-${EDITION}-linux-${RELEASE}.iso" @@ -1626,6 +1617,12 @@ function get_reactos() { echo "${URL} ${HASH}" } +function get_rebornos() { + local ISO=$(curl -s 'https://www.rebornos.org/download/' | grep -ohE 'https://pub-cb7a4d4f7a974896b3bf40c52d1defbc.r2.dev/RebornOS-ISO/(rebornos_xfce_minimal|rebornos_iso)-[0-9]{4}.[0-9]{2}.[0-9]{2}-x86_64.iso' | tail -n1) + local HASH=$(curl -s 'https://www.rebornos.org/download/' | grep -ozP 'Checksum MD5:.*[0-9a-fA-F]{32}' | grep -zoP '[0-9a-fA-F]{32}' | cut -d '' -f1) + echo "${ISO} ${HASH}" +} + function get_rockylinux() { local EDITION="${1:-}" if [[ "${RELEASE}" =~ ^8. ]] && [[ "${EDITION}" == "dvd" ]]