From ec40703b28c1caca8eb66f97737b50765ddd6f2a Mon Sep 17 00:00:00 2001 From: zenobit Date: Tue, 14 Mar 2023 12:00:22 +0100 Subject: [PATCH] renew: sh -c instead of $TERMINAL -e --- config/renew.sh | 4 ++-- quickget | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/renew.sh b/config/renew.sh index 531cd05..cb28c23 100755 --- a/config/renew.sh +++ b/config/renew.sh @@ -59,7 +59,7 @@ Type=Application Name=$get_name releases=$releases replace='\"!\"' -Exec=sh -c 'cd "$QUICKEMU_VMS_DIR" && yad --form --field=\"Release:CB\" \"${releases// /$replace}\" | cut -d\"|\" -f1 | xargs -I{} $TERMINAL -e \"quickget $get_name {}\"' +Exec=sh -c 'cd "$QUICKEMU_VMS_DIR" && yad --form --field=\"Release:CB\" \"${releases// /$replace}\" | cut -d\"|\" -f1 | xargs -I{} sh -c \"quickget $get_name {}\"' Icon=$icon_file Categories=System;Virtualization;" echo "$desktop_file_content" > "$CONFIG_DIR"/vms_supported/"$vm_desktop_file".desktop @@ -71,7 +71,7 @@ Name=$get_name releases=$releases editions=$editions replace=$replace -Exec=sh -c 'cd \"$QUICKEMU_VMS_DIR\" && yad --form --separator=\" \" --field=\"Release:CB\" \"${releases// /$replace}\" --field=\"Edition:CB\" \"${editions// /$replace}\" | xargs -I{} $TERMINAL -e \"quickget $get_name {}\"' +Exec=sh -c 'cd \"$QUICKEMU_VMS_DIR\" && yad --form --separator=\" \" --field=\"Release:CB\" \"${releases// /$replace}\" --field=\"Edition:CB\" \"${editions// /$replace}\" | xargs -I{} sh -c \"quickget $get_name {}\"' Icon=$icon_file Categories=System;Virtualization;" echo "$desktop_file_content" > "$CONFIG_DIR"/vms_supported/"$vm_desktop_file".desktop diff --git a/quickget b/quickget index 4aaef41..fad0fcb 100755 --- a/quickget +++ b/quickget @@ -1158,10 +1158,12 @@ function get_centos-stream() { function get_cereus() { local HASH="" local ISO="" - local URL="" + local URL="https://sourceforge.net/projects/cereus-linux/files/isos/beta/${RELEASE}/${EDITION}" + local DATE="" + DATE=$(wget -q -O- "${URL}/SHA256" | cut -d' ' -f3 | grep "${EDITION}") case ${EDITION} in base) - ISO="cereus-beta-live-x86_64-xfce-2023.02.17.iso" + ISO="cereus-beta-live-x86_64-xfce-${DATE}.iso" URL="https://sourceforge.net/projects/cereus-linux/files/isos/beta/latest/base" HASH=$(wget -q -O- ${URL}/SHA256 | grep "${ISO}" | cut -d' ' -f2) ;;