diff --git a/defaults.inc b/defaults.inc index 4dcfb9b..803df68 100755 --- a/defaults.inc +++ b/defaults.inc @@ -2,7 +2,7 @@ action="$1" FOLDER='/opt/idssys/linupx' -VERS='6.60.10-08282023' +VERS='6.60.11-08292023' diff --git a/linupx-scripts.sh b/linupx-scripts.sh index a61133c..6dcc92b 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -218,7 +218,7 @@ GO_REBOOT() { echo 'The system is now rebooting...' sleep 60 exit 0;; - * ) SCRIPT_MENU;; + * ) MAIN_MENU;; esac } SHUTDOWN() { @@ -230,7 +230,7 @@ SHUTDOWN() { echo 'The system is now shutting down...' sleep 60 exit 0;; - * ) SCRIPT_MENU;; + * ) MAIN_MENU;; esac } ENDISASU() { @@ -315,7 +315,7 @@ REMOVEFLOPPY() { else shutdown -r now; fi sleep 60 exit 0;; - * ) SCRIPT_MENU;; + * ) MAIN_MENU;; esac else echo -e "${idsCL[Green]}Floppy has already been removed.${idsCL[Default]}" @@ -826,7 +826,7 @@ IPV6_DISABLED=yes esac } -SCRIPT_MENU() { +MAIN_MENU() { if [ -f ${FOLDER}/lastrun ]; then LASTRUND=$(stat -c %y ${FOLDER}/lastrun | cut -d ' ' -f1) LASTRUNT=$(stat -c %y ${FOLDER}/lastrun | cut -d ' ' -f2 | cut -d '.' -f1) @@ -889,22 +889,22 @@ SCRIPT_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;; - 7) PIPUPGRADE ii; SCRIPT_MENU;; - 8) PIPUPGRADEFIX; SCRIPT_MENU;; - 9) UPDATEREPOKEYS; SCRIPT_MENU;; - 0) ENDISASU; SCRIPT_MENU;; + 1) DRYRUN1; MAIN_MENU;; + 2) UPDATE1; MAIN_MENU;; + 3) UPDATE2; MAIN_MENU;; + 4) DRYRUN2; MAIN_MENU;; + 5) DISTUPGRADE; MAIN_MENU;; + 6) PIPUPGRADE; MAIN_MENU;; + 7) PIPUPGRADE ii; MAIN_MENU;; + 8) PIPUPGRADEFIX; MAIN_MENU;; + 9) UPDATEREPOKEYS; MAIN_MENU;; + 0) ENDISASU; MAIN_MENU;; [Ii]) INSTALL_MENU;; [Mm]) MISC_MENU;; - [Rr]) GO_REBOOT; SCRIPT_MENU;; - [Ss]) SHUTDOWN; SCRIPT_MENU;; + [Rr]) GO_REBOOT; MAIN_MENU;; + [Ss]) SHUTDOWN; MAIN_MENU;; [Qq]) EXIT1 exit 0;; *) echo "Thats an invaild option,"; @@ -959,7 +959,7 @@ MISC_MENU() { [Vv]) ADDVEEAMUSER ENTER2CONTINUE MISC_MENU;; - [Bb]) MISC_MENU;; + [Bb]) MAIN_MENU;; [Ii]) INSTALL_MENU;; [Qq]) EXIT1; exit 1;; *) echo "Thats an invaild option,"; @@ -1021,7 +1021,7 @@ INSTALL_MENU() { [Pp]) POSTFIX_INSTALL; INSTALL_MENU;; [Nn]) NETDATA_INSTALL; INSTALL_MENU;; [Tt]) TAILSCALE_INSTALL; INSTALL_MENU;; - [Bb]) SCRIPT_MENU;; + [Bb]) MAIN_MENU;; [Mm]) MISC_MENU;; [Qq]) EXIT1 exit 1;; @@ -1045,7 +1045,7 @@ if [ ${action-x} ]; then # exit 1;; esac else - SCRIPT_MENU + MAIN_MENU fi exit 0