diff --git a/defaults.inc b/defaults.inc index 58ae14a..1a03032 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,7 +3,7 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.2.5' +VERS='2026.2.6' RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index 5243090..9e95c06 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -8,17 +8,20 @@ source /opt/idssys/ta-proxmenu/defaults.inc INSTALL_ACRONIS() { - # read -n 1 -p "Are you sure you wish to install Acronis (Y/n)?" choice - # case "$choice" in - # [Nn]) MAIN_MENU;; - # * ) - # echo - - echo -e "\n${idsCL[LightYellow]}Acronis install script has not been finished ${idsCL[Default]}" - echo -e "\n${idsCL[LightCyan]}You're just going to have to do it yourself, you lazy bum .... :*^(${idsCL[Default]}" - [ ${action-x} ] && exit 0 - ENTER2CONTINUE - # esac + read -n 1 -p "Are you sure you wish to install Acronis (Y/n)?" choice + case "$choice" in + [Nn]) MAIN_MENU;; + * ) + echo + cd /tmp + 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]}" + [ ${action-x} ] && exit 0 || ENTER2CONTINUE + esac } INSTALL_PROXMENUX() { @@ -28,9 +31,9 @@ INSTALL_PROXMENUX() { * ) echo bash -c "$(wget -qLO - https://raw.githubusercontent.com/MacRimi/ProxMenux/main/install_proxmenux.sh)" + systemctl disable --now proxmenux-monitor echo -e "\n${idsCL[Green]}ProxMenux has been installed${idsCL[Default]}" - [ ${action-x} ] && exit 0 - ENTER2CONTINUE + [ ${action-x} ] && exit 0 || ENTER2CONTINUE esac } @@ -49,10 +52,9 @@ INSTALL_SCREENCONNECT() { apt remove "connectwis*" -y dpkg -i /tmp/scinstall rm -f /tmp/scinstall - + systemctl disable --now proxmenux-monitor echo -e "\n${idsCL[Green]}ScreenConnect has been installed${idsCL[Default]}" - [ ${action-x} ] && exit 0 - ENTER2CONTINUE + [ ${action-x} ] && exit 0 || ENTER2CONTINUE esac } @@ -72,8 +74,7 @@ INSTALL_RMM() { rm -f /tmp/rmminstall echo -e "\n${idsCL[Green]}RMM has been installed${idsCL[Default]}" - [ ${action-x} ] && exit 0 - ENTER2CONTINUE + [ ${action-x} ] && exit 0 || ENTER2CONTINUE esac } @@ -123,8 +124,7 @@ INSTALL_OMSA() { echo -e "\n${idsCL[Green]}Dell OMSA has been installed${idsCL[Default]}" echo -e "\n${idsCL[LightCyan]}Available at: ${idsCL[LightGreen]}https://[proxmox-host-ip]:1311${idsCL[Default]}" - [ ${action-x} ] && exit 0 - ENTER2CONTINUE + [ ${action-x} ] && exit 0 || ENTER2CONTINUE esac } @@ -151,8 +151,7 @@ DETECT_CPU(){ *) echo;; esac - [ ${action-x} ] && exit 0 - ENTER2CONTINUE + [ ${action-x} ] && exit 0 || ENTER2CONTINUE }