From 601457f9d08a21eff92c17b00d8ea856963ab885 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 25 Jul 2026 15:35:51 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- proxmenu-scripts.sh | 180 +++++++++++++++++--------------------------- 2 files changed, 72 insertions(+), 110 deletions(-) diff --git a/defaults.inc b/defaults.inc index 4074c70..2897e59 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,7 +3,7 @@ action="${1:-}" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.7.25-27' +VERS='2026.7.25-28' noupdate=' ' diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index 3825af8..1001d90 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -108,39 +108,26 @@ INSTALL_PULSE() { } INSTALL_ACRONIS() { - read -n 1 -p "Are you sure you wish to install Acronis (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) - echo - if ! TAPM_AUTHORIZE "install-acronis" "" "Acronis installation"; then - FINISH_ACTION - return - fi - TAPM_CLEAR_AUTHORIZATION - cd /tmp || return 1 - wget "https://us5-cloud.acronis.com/bc/api/ams/links/agents/redirect?language=multi&channel=CURRENT&system=linux&architecture=64&productType=enterprise&login=010180ae-63c4-4495-bed0-4ec934c25af9&white_labeled=0" -O ./acronisinstall - chmod +x ./acronisinstall - ./acronisinstall - rm -f ./acronisinstall - echo - echo -e "\n${idsCL[Green]}Acronis has been installed${idsCL[Default]}" - FINISH_ACTION - ;; - esac + echo + if ! TAPM_AUTHORIZE "install-acronis" "" "Acronis installation"; then + FINISH_ACTION + return + fi + TAPM_CLEAR_AUTHORIZATION + cd /tmp || return 1 + wget "https://us5-cloud.acronis.com/bc/api/ams/links/agents/redirect?language=multi&channel=CURRENT&system=linux&architecture=64&productType=enterprise&login=010180ae-63c4-4495-bed0-4ec934c25af9&white_labeled=0" -O ./acronisinstall + chmod +x ./acronisinstall + ./acronisinstall + rm -f ./acronisinstall + echo + echo -e "\n${idsCL[Green]}Acronis has been installed${idsCL[Default]}" + FINISH_ACTION } INSTALL_PROXMENUX() { -# read -n 1 -p "Are you sure you wish to install ProxMenux (Y/n)?" choice -# case "$choice" in -# [Nn]) MAIN_MENU;; -# * ) -# echo - bash -c "$(wget -qLO - https://raw.githubusercontent.com/MacRimi/ProxMenux/main/install_proxmenux.sh)" + bash -c "$(wget -qLO - https://raw.githubusercontent.com/MacRimi/ProxMenux/main/install_proxmenux.sh)" # systemctl disable --now proxmenux-monitor - menu -# echo -e "\n${idsCL[Green]}ProxMenux has been installed${idsCL[Default]}" -# esac + menu } PROXMENUX_POST_INSTALL() { @@ -154,80 +141,65 @@ PROXMENUX_POST_INSTALL() { } INSTALL_GLANCES() { - read -n 1 -p "Are you sure you wish to install Glances (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) - echo - apt install glances -y - echo -e "\n${idsCL[Green]}Glances has been installed${idsCL[Default]}" - FINISH_ACTION - esac + echo + apt install glances -y + echo -e "\n${idsCL[Green]}Glances has been installed${idsCL[Default]}" + FINISH_ACTION } INSTALL_SCREENCONNECT() { - read -n 1 -p "Are you sure you wish to install ScreenConnect (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) - echo - if ! TAPM_AUTHORIZE "install-screenconnect" "" "ScreenConnect installation"; then - FINISH_ACTION - return - fi - TAPM_CLEAR_AUTHORIZATION - echo -en "\n${idsCL[LightYellow]}Paste the URL provided from the Build Installer: ${idsCL[Default]}" - read -r -s SCURL - echo - [[ -n "$SCURL" ]] || { echo "No URL supplied."; FINISH_ACTION; return; } - wget "${SCURL}" -O /tmp/scinstall - unset SCURL - dpkg -i /tmp/scinstall - apt install --fix-broken -y - apt remove "connectwis*" -y > /dev/null 2>&1 - dpkg -i /tmp/scinstall - rm -f /tmp/scinstall - systemctl disable --now proxmenux-monitor - echo -e "\n${idsCL[Green]}ScreenConnect has been installed${idsCL[Default]}" + echo + if ! TAPM_AUTHORIZE "install-screenconnect" "" "ScreenConnect installation"; then FINISH_ACTION - esac + return + fi + TAPM_CLEAR_AUTHORIZATION + echo -en "\n${idsCL[LightYellow]}Paste the URL provided from the Build Installer: ${idsCL[Default]}" + read -r -s SCURL + echo + [[ -n "$SCURL" ]] || { echo "No URL supplied."; FINISH_ACTION; return; } + wget "${SCURL}" -O /tmp/scinstall + unset SCURL + dpkg -i /tmp/scinstall + apt install --fix-broken -y + apt remove "connectwis*" -y > /dev/null 2>&1 + dpkg -i /tmp/scinstall + rm -f /tmp/scinstall + systemctl disable --now proxmenux-monitor + echo -e "\n${idsCL[Green]}ScreenConnect has been installed${idsCL[Default]}" + FINISH_ACTION } INSTALL_RMM() { - read -n 1 -p "Are you sure you wish to install RMM (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) - echo - if ! TAPM_AUTHORIZE "install-rmm" "" "RMM installation"; then - FINISH_ACTION - return - fi - TAPM_CLEAR_AUTHORIZATION - - echo -en "\n${idsCL[LightYellow]}Paste the Linux Server URL provided from the Download Agent screen: ${idsCL[Default]}" - read -r -s RMMURL - echo - [[ -n "$RMMURL" ]] || { echo "No URL supplied."; FINISH_ACTION; return; } - wget "${RMMURL}" -O /tmp/rmminstall - if [[ "$RMMURL" != *TKN* || "$RMMURL" != */RUN* ]]; then - echo "Unable to extract the RMM token from the URL." - unset RMMURL - FINISH_ACTION - return - fi - TOKEN="${RMMURL#*TKN}" - TOKEN="${TOKEN%%/RUN*}" - unset RMMURL - [[ -n "$TOKEN" ]] || { echo "The RMM token is empty."; FINISH_ACTION; return; } - TOKEN="$TOKEN" bash /tmp/rmminstall - unset TOKEN - systemctl restart ITSPlatform - # rm -f /tmp/rmminstall - - echo -e "\n${idsCL[Green]}RMM has been installed${idsCL[Default]}" + echo + if ! TAPM_AUTHORIZE "install-rmm" "" "RMM installation"; then FINISH_ACTION - esac + return + fi + TAPM_CLEAR_AUTHORIZATION + + echo -en "\n${idsCL[LightYellow]}Paste the Linux Server URL provided from the Download Agent screen: ${idsCL[Default]}" + read -r -s RMMURL + echo + [[ -n "$RMMURL" ]] || { echo "No URL supplied."; FINISH_ACTION; return; } + wget "${RMMURL}" -O /tmp/rmminstall + if [[ "$RMMURL" != *TKN* || "$RMMURL" != */RUN* ]]; then + echo "Unable to extract the RMM token from the URL." + unset RMMURL + FINISH_ACTION + return + fi + TOKEN="${RMMURL#*TKN}" + TOKEN="${TOKEN%%/RUN*}" + unset RMMURL + [[ -n "$TOKEN" ]] || { echo "The RMM token is empty."; FINISH_ACTION; return; } + TOKEN="$TOKEN" bash /tmp/rmminstall + unset TOKEN + systemctl restart ITSPlatform + # rm -f /tmp/rmminstall + + echo -e "\n${idsCL[Green]}RMM has been installed${idsCL[Default]}" + FINISH_ACTION } INSTALL_S1() { @@ -282,10 +254,6 @@ INSTALL_S1() { } INSTALL_OMSA() { - read -n 1 -p "Are you sure you wish to install Dell OpenManage Administrator (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) echo mkdir -p /tmp/omsa cd /tmp/omsa || return 1 @@ -327,7 +295,6 @@ INSTALL_OMSA() { echo -e "\n${idsCL[Green]}Dell OMSA has been installed${idsCL[Default]}" echo -e "\n${idsCL[LightCyan]}Available at: ${idsCL[LightGreen]}https://${RNIP}:1311${idsCL[Default]}" FINISH_ACTION - esac } DOWNLOAD_VIRTIO() { @@ -486,17 +453,12 @@ MAINTENANCE_MODE(){ } INSTALL_KEEPALIVE() { - read -n 1 -p "Are you sure you wish to install Keepalive on all Hosts (Y/n)?" choice - case "$choice" in - [Nn]) echo;; - * ) - echo + echo - bash /opt/idssys/ta-proxmenu/inc/deploy-proxmox-keepalived.sh + bash /opt/idssys/ta-proxmenu/inc/deploy-proxmox-keepalived.sh - echo -e "\n${idsCL[Green]}Keepalive has been installed${idsCL[Default]}" - FINISH_ACTION - esac + echo -e "\n${idsCL[Green]}Keepalive has been installed${idsCL[Default]}" + FINISH_ACTION } UPDATE_CACHE_DIR='/var/cache/ta-proxmenu'