diff --git a/linupx-scripts.sh b/linupx-scripts.sh index 04d654a..76f2403 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -159,27 +159,6 @@ DRYRUN2() { if [ ${action-x} ]; then exit 0; fi read -n 1 -s -p "Press any key to continue" } -GITUPDATE() { - echo "" - echo "" - echo "-------------------------------------------------------" - if [ -d "$FOLDER" ]; then - if [ "$EUID" -ne 0 ]; then sh -c 'cd $FOLDER && sudo git pull' - else sh -c 'cd $FOLDER && git pull' - fi - else - if [ "$EUID" -ne 0 ]; then sh -c 'cd $FOLDER && sudo git pull' - else sh -c 'cd $FOLDER && git pull' - fi - fi - echo "-------------------------------------------------------" - echo "" - echo "" - echo "If any updates were found above, you'll need to" - echo "restart this script to apply the new updates." - echo "" - read -n 1 -s -p "Press any key to continue" -} GO_REBOOT() { read -n 1 -p "Are you sure you wish to reboot (y/n)?" choice case "$choice" in @@ -215,6 +194,20 @@ EXIT1() { exit 0 } +WEBMIN_INSTALL() { + read -n 1 -p "Are you sure you wish to install Webmin (y/n)?" choice + case "$choice" in + [Yy]) + bash <(curl -sL https://scity.xyz/webmin) + echo "" + echo -e "${Green}Webmin has been Installed{Color_Off}" + if [ ${action-x} ]; then exit 0; fi + read -n 1 -s -p "Press any key to continue" + exit 0;; + * ) INSTALL_MENU;; + esac +} + SCRIPT_MENU() { LASTRUND=$(stat -c %y /opt/LinUPx/lastrun | cut -d ' ' -f1) LASTRUNT=$((stat -c %y /opt/LinUPx/lastrun | cut -d ' ' -f2) | cut -d '.' -f1) @@ -303,12 +296,9 @@ INSTALL_MENU() { echo -e "Domain: ${BBlue}$(hostname -d)${Color_Off}" echo -e "${LGreen}---------------------------------------------------------------------------${Color_Off}" echo "" - echo " [1] Check for Updates/Upgrades" - echo " [2] Run Updates" - echo " [3] Run Updates w/o retrieving new repo list" - echo " [4] Check for Upgrades with obsoletes enabled" - echo " [5] Run Dist-Upgrade" - echo " [6] Run Python-Pip Upgrades" + echo " [1] Webmin Install" + echo " [2] Glnces Install" + echo " [3] x11vnc Install" echo "" echo " [B] Back to Update Scripts" echo " [Q] Quit" @@ -318,20 +308,12 @@ INSTALL_MENU() { read -n 1 opt echo "" case $opt in - 1) DRYRUN1 - SCRIPT_MENU;; - 2) UPDATE1 - SCRIPT_MENU;; - 3) UPDATE2 - SCRIPT_MENU;; - 4) DRYRUN2 - SCRIPT_MENU;; - 5) DISTUPGRADE - SCRIPT_MENU;; - 6) PIPUPGRADE - SCRIPT_MENU;; - 0) ENDISASU - SCRIPT_MENU;; + 1) WEBMIN_INSTALL + INSTALL_MENU;; + 2) GLANCES_INSTALL + INSTALL_MENU;; + 3) X11VNC_INSTALL + INSTALL_MENU;; [Bb]) SCRIPT_MENU;; [Qq]) EXIT1 exit 1;;