From ddfec2f1f19e8352051e350d75c271fb8a9f065b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 6 Mar 2026 23:14:31 -0600 Subject: [PATCH] update --- defaults.inc | 5 ++--- proxmenu-scripts.sh | 17 +++++------------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/defaults.inc b/defaults.inc index b237c90..6571ae4 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,13 +1,12 @@ #!/usr/bin/env bash -# TA-Proxmenu - Proxmox Scripts for TA Use +# TA-Proxmenu - Proxmox Setup Scripts for TA Use action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.3.14' +VERS='2026.3.15' 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 diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index 63897cb..2b7a5d4 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# TA-Proxmenu - Proxmox Scripts for TA Use +# TA-Proxmenu - Proxmox Setup Scripts for TA Use [ "${2}" != "q" ] && source /opt/idssys/defaults/colors.inc @@ -36,7 +36,6 @@ INSTALL_ACRONIS() { esac } - INSTALL_PROXMENUX() { # read -n 1 -p "Are you sure you wish to install ProxMenux (Y/n)?" choice # case "$choice" in @@ -52,13 +51,13 @@ INSTALL_PROXMENUX() { PROXMENUX_POST_INSTALL() { PMFLDR='/usr/local/share/proxmenux/scripts/post_install' - echo 1 [ ! -f ${PMFLDR}/customizable_post_install.sh ] && INSTALL_PROXMENUX - echo 2 bash ${PMFLDR}/customizable_post_install.sh - [ ${action-x} ] && exit 0 || ENTER2CONTINUE touch /opt/.PROXMENUX_POST_INSTALL + [ -s /etc/apt/sources.list ] && cat /dev/null > /etc/apt/sources.list + + [ ${action-x} ] && exit 0 || ENTER2CONTINUE } INSTALL_GLANCES() { @@ -202,12 +201,6 @@ DOWNLOAD_VIRTIO() { DETECT_CPU(){ echo - if ! command -v proxclmc &> /dev/null || [ ! -f /etc/apt/sources.list.d/gyptazy.list ]; then - curl https://git.gyptazy.com/api/packages/gyptazy/debian/repository.key -o /etc/apt/keyrings/gyptazy.asc - echo "deb [signed-by=/etc/apt/keyrings/gyptazy.asc] https://packages.gyptazy.com/api/packages/gyptazy/debian trixie main" | sudo tee -a /etc/apt/sources.list.d/gyptazy.list - apt update && apt -y install proxclmc - echo - fi proxclmc echo @@ -230,7 +223,7 @@ MAIN_MENU() { do clear echo - echo -e " ${idsCL[Green]}TA-Proxmenu - Proxmox Scripts${idsCL[Default]} ${idsCL[Default]}${VERS}" + echo -e " ${idsCL[Green]}TA-Proxmenu - Proxmox Setup Scripts${idsCL[Default]} ${idsCL[Default]}${VERS}" echo -e "${idsCL[Green]}---------------------------------------------------------------------------${idsCL[Default]}" echo -e "Hostname: ${idsCL[Cyan]}$(hostname -s)${idsCL[Default]}" echo -e "IP Address: ${idsCL[Cyan]}${RNIP}${idsCL[Default]}"