diff --git a/defaults.inc b/defaults.inc index 723b914..e98b58d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,18 +3,15 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.4.28-4' +VERS='2026.4.30-1' noupdate=' restart cpu mm ' RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) -url="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso" -while redirect_url=$( curl -I -s -S -f -w "%{redirect_url}\\n" -o /dev/null "${url}" ); do - VIRTIO_DOWNLOAD_URL=${url}; url=${redirect_url}; [[ -z "$url" ]] && break -done -VIRTIO_FILE=${VIRTIO_DOWNLOAD_URL##*/} +VIRTIO_URL="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso" + # if [ -f /etc/apt/sources.list.d/gyptazy.list ]; then diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index 06ceeaf..a7311fc 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -174,15 +174,20 @@ INSTALL_OMSA() { } DOWNLOAD_VIRTIO() { - echo -e "\n${idsCL[LightCyan]}Current \"Stable\" version available for download: ${idsCL[White]}${VIRTIO_FILE}${idsCL[Default]}" - if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then - echo -en "\n${idsCL[LightRed]}Removing existing download ... " - rm -f /var/lib/vz/template/iso/${VIRTIO_FILE} - echo -e "${idsCL[Red]}Done${idsCL[Default]}" - fi - wget -q -F -P /var/lib/vz/template/iso ${VIRTIO_DOWNLOAD_URL} & - echo -e "\n${idsCL[LightCyan]}Downloading will continue in the background\n" - [ ${action-x} ] && exit 0 || ENTER2CONTINUE + while redirect_url=$( curl -I -s -S -f -w "%{redirect_url}\\n" -o /dev/null "${VIRTIO_URL}" ); do + VIRTIO_DOWNLOAD_URL=${url}; url=${redirect_url}; [[ -z "$url" ]] && break + done + VIRTIO_FILE=${VIRTIO_DOWNLOAD_URL##*/} + + echo -e "\n${idsCL[LightCyan]}Current \"Stable\" version available for download: ${idsCL[White]}${VIRTIO_FILE}${idsCL[Default]}" + if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then + echo -en "\n${idsCL[LightRed]}Removing existing download ... " + rm -f /var/lib/vz/template/iso/${VIRTIO_FILE} + echo -e "${idsCL[Red]}Done${idsCL[Default]}" + fi + wget -q -F -P /var/lib/vz/template/iso ${VIRTIO_DOWNLOAD_URL} & + echo -e "\n${idsCL[LightCyan]}Downloading will continue in the background\n" + [ ${action-x} ] && exit 0 || ENTER2CONTINUE } DETECT_CPU(){