Update linupx-scripts.sh

linupx-scripts.sh

@@ -33,8 +33,8 @@ UPDATE1() {
 	touch "${FOLDER}/lastrun"
 	echo
 	echo -e "${idsCL[Green]}Updates have completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 UPDATE2() {
 	if [ "$opennms" = true ]; then
@@ -55,8 +55,8 @@ UPDATE2() {
 	touch "${FOLDER}/lastrun"
 	echo
 	echo -e "${idsCL[Green]}Updated Upgrades have completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 UPDATE3() {
     restart_flag='';
@@ -139,8 +139,8 @@ DISTUPGRADE() {
 	fi
 	echo
 	echo -e "${idsCL[Green]}Dist Upgrades has completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 PIPUPGRADE() {
 	if ! command -v jq &> /dev/null
@@ -157,20 +157,20 @@ PIPUPGRADE() {
 	fi
 	echo
 	echo -e "${idsCL[Green]}Python-Pip Upgrades has completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 PIPUPGRADEFIX(){
 	${APTFUNC} install libsystemd-dev libcairo2-dev libcurl4-openssl-dev libssl-dev build-essential libpython3-dev libdbus-1-dev libgirepository1.0-dev
 	echo
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 DNSUPDATE() {
 	bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/update-dns.sh)
 	echo
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 AUTOREMOVE() {
 	if 	[[ "$useAutoremove" -ne 0 ]]; then 
@@ -195,8 +195,8 @@ DRYRUN1() {
 	fi
 	echo
 	echo -e "${idsCL[Green]}Upgrade dry-run has completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 DRYRUN2() {
 	if type yum &>/dev/null; then
@@ -206,8 +206,8 @@ DRYRUN2() {
 	fi
 	echo
 	echo -e "${idsCL[Green]}Dist-Upgrade dry-run has completed${idsCL[Default]}"
-	if [ ${action-x} ]; then exit 0; fi
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 GO_REBOOT() {
 	read -n 1 -p "Are you sure you wish to reboot (y/N)?" choice
@@ -253,8 +253,8 @@ WEBMIN_INSTALL() {
 		bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-webmin.sh)
 		echo
 		echo -e "${idsCL[Green]}Webmin has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 GLANCES_INSTALL() {
@@ -266,8 +266,8 @@ GLANCES_INSTALL() {
 		bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-glances.sh)
 		echo
 		echo -e "${idsCL[Green]}Glances has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 MYSQLBU_INSTALL() {
@@ -279,8 +279,8 @@ MYSQLBU_INSTALL() {
 		bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-mysqlbu.sh)
 		echo
 		echo -e "${idsCL[Green]}MySQL-BU has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 DSMON_INSTALL() {
@@ -292,8 +292,8 @@ DSMON_INSTALL() {
 		bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/install-dsmon.sh)
 		echo
 		echo -e "${idsCL[Green]}DSMon has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 REMOVEFLOPPY() {
@@ -320,7 +320,8 @@ REMOVEFLOPPY() {
 	else
 		echo -e "${idsCL[Green]}Floppy has already been removed.${idsCL[Default]}"
 		echo
-		read -n 1 -s -p "Press any key to continue"
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	fi
 }
 
@@ -337,26 +338,25 @@ NETDATA_INSTALL() {
 			systemctl daemon-reload
 			echo
 			echo -e "${idsCL[Green]}Netdata Agent has been Removed${idsCL[Default]}"
-			if [ ${action-x} ]; then exit 0; fi
-			read -n 1 -s -p "Press any key to continue";;
-		* ) INSTALL_MENU;;
+			[ ${action-x} ] && exit 0
+			ENTER2CONTINUE
 		esac
 		
 	else
 		
 		read -n 1 -p "Are you sure you wish to install Netdata Agent (Y/n)?" choice
 		case "$choice" in 
-		[Nn]) INSTALL_MENU;;
+		[Nn]) t=t;;
 		* )
 			echo
 			wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token GKUQidqs3HAdWdyLgYjjHpI6k0W09TPxv4hyEvESuNKF9Xy0SKBvOr7BokNZHn6j7GUHlfc_R8UQp-dEXPAoRHdEmbSRCGOXX4XiOfMRazUk6Dd_3qjIdqJu9YqDaL2jw1hSTzw --claim-url https://app.netdata.cloud
 			echo
 			echo -e "${idsCL[Green]}Netdata Agent has been Installed${idsCL[Default]}"
-			if [ ${action-x} ]; then exit 0; fi
-			read -n 1 -s -p "Press any key to continue";;
 		esac
 		
 	fi
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 
 NETDATA_UNINSTALL(){
@@ -430,6 +430,9 @@ NETDATA_UNINSTALL(){
 	sudo rm -rf /opt/netdata -R
 
 	systemctl daemon-reload
+	
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 
 IPERF_INSTALL() {
@@ -450,8 +453,8 @@ IPERF_INSTALL() {
 		
 		echo
 		echo -e "${idsCL[Green]}iPerf has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 CHANGECOPYCERTS_INSTALL() {
@@ -469,8 +472,8 @@ CHANGECOPYCERTS_INSTALL() {
 		
 		echo
 		echo -e "${idsCL[Green]}copycerts.sh has been updated${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 SPEEDTEST_INSTALL() {
@@ -490,8 +493,8 @@ SPEEDTEST_INSTALL() {
 		echo -e "${idsCL[Green]}SpeedTest has been Installed${idsCL[Default]}"
 		echo
 		echo -e "${LightCyan}To run, use the command: speedtest${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 URBACKUP_INSTALL() {
@@ -513,8 +516,8 @@ URBACKUP_INSTALL() {
 		echo
 		echo -e "${idsCL[Green]}UrBackup Client has been Installed${idsCL[Default]}"
 		echo
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 X11VNC_INSTALL() {
@@ -526,8 +529,8 @@ X11VNC_INSTALL() {
 		bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-vnc.sh)
 		echo
 		echo -e "${idsCL[Green]}x11vnc has been Installed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 LINUPX_UNINSTALL() {
@@ -566,7 +569,7 @@ TAILSCALE_INSTALL() {
 	echo "This script currently only works with Ubuntu"
 	read -n 1 -p "Are you sure you wish to install Tailscale (Y/n)?" choice
 	case "$choice" in 
-		[Nn]) INSTALL_MENU;;
+		[Nn]) t=t;;
 		* )
 			echo
 			
@@ -575,12 +578,12 @@ TAILSCALE_INSTALL() {
 			curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release --codename --short).noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null
 			curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release --codename --short).tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list
 			${APTFUNC} update
-			${APTFUNC} install tailscale
+			${APTFUNC} install tailscale -y
 			echo
 			
 			read -n 1 -p "Tailscale is now installed, would you like to connect to https://headscale.scity.us (Y/n)?" choice
 			case "$choice" in 
-				[Nn]) INSTALL_MENU;;
+				[Nn]) y=y;;
 				* )
 					tailscale up --accept-dns=false --login-server=https://headscale.scity.us --accept-routes=false
 				;;
@@ -593,19 +596,18 @@ TAILSCALE_INSTALL() {
 ENABLE_REMOTESYSLOG(){
 	read -n 1 -p "Are you sure you wish to enable sending syslogs to ${RemoteSyslogServer} (Y/n)?" choice
 	case "$choice" in 
-		[Nn]) SCRIPT_MENU;;
+		[Nn]) t=t;;
 		* )
 			echo
 			echo -e "\n\n*.* @${RemoteSyslogServer}:514" >> /etc/rsyslog.d/50-default.conf
 			service rsyslog restart
-			SCRIPT_MENU
 		;;
 	esac
 }
 PYTHON3UPGRADE(){
 	read -n 1 -p "Are you sure you wish to upgrade to Python3 (Y/n)?" choice
 	case "$choice" in 
-	[Nn]) INSTALL_MENU;;
+	[Nn]) t=t;;
 	* )
 		add-apt-repository -y ppa:deadsnakes/ppa
 		${APTFUNC} install -y python3.10 python3-pip
@@ -615,22 +617,21 @@ PYTHON3UPGRADE(){
 		
 		echo
 		echo -e "${idsCL[Green]}Python3.10 Upgrade has been Completed${idsCL[Default]}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue"
-		SCRIPT_MENU;;
+		[ ${action-x} ] && exit 0
+		ENTER2CONTINUE
 	esac
 }
 POSTFIX_INSTALL(){
 	bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-postfix.sh)
 	echo
-	read -n 1 -s -p "Press any key to continue"
-	INSTALL_MENU
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 BASHRC_INSTALL(){
 	echo -e "${idsCL[Green]}Installing root/.bashrc${idsCL[Default]}"
 	/usr/bin/wget -O ~/.bashrc https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/bashrc
-	read -n 1 -s -p "Press any key to continue"
-	INSTALL_MENU
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 MPVMFIX(){
 	echo -e "
@@ -662,14 +663,16 @@ COPYCERTS_UPDATE(){
 	else
 		echo -e "${Blue}copycerts.sh not found${idsCL[Default]}"
 	fi
-	[ ${1} ] && read -n 1 -s -p "Press any key to continue" || exit 0
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 
 UPDATEREPOKEYS(){
 	apt-key adv --refresh-keys --keyserver keyserver.ubuntu.com
 	echo
 	echo -e "${idsCL[Green]}APT Repo Keys have been updated${idsCL[Default]}"
-	read -n 1 -s -p "Press any key to continue"
+	[ ${action-x} ] && exit 0
+	ENTER2CONTINUE
 }
 
 RECONFIGURE_NETWORK(){
@@ -817,8 +820,8 @@ IPV6_DISABLED=yes
 				;;
 			esac
 			echo -e "\n${idsCL[Green]}Network has been updated${idsCL[Default]}\n"
-			read -n 1 -s -p "Press any key to continue"
-			echo
+			[ ${action-x} ] && exit 0
+			ENTER2CONTINUE
 		;;
 	esac
 }
@@ -886,34 +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; 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;;
 				
 			[Ii]) INSTALL_MENU;;
 			[Mm]) MISC_MENU;;
 				
-			[Rr]) GO_REBOOT
-				SCRIPT_MENU;;
-			[Ss]) SHUTDOWN
-				SCRIPT_MENU;;
+			[Rr]) GO_REBOOT; SCRIPT_MENU;;
+			[Ss]) SHUTDOWN; 	SCRIPT_MENU;;
 			[Qq]) EXIT1
 				exit 0;;
 			*)	echo "Thats an invaild option,";
@@ -959,14 +950,14 @@ MISC_MENU() {
 			2) REMOVEFLOPPY; MISC_MENU;;
 			3) MPVMFIX
 				echo
-				read -n 1 -s -p "Press any key to continue"
+				ENTER2CONTINUE
 				MISC_MENU;;
 			[Uu]) COPYCERTS_UPDATE menu; MISC_MENU;;
 			[Dd]) DNSUPDATE; MISC_MENU;;
 			[Cc]) CHANGECOPYCERTS_INSTALL; MISC_MENU;;
 			[Pp]) PYTHON3UPGRADE; MISC_MENU;;
 			[Vv]) ADDVEEAMUSER
-				read -n 1 -s -p "Press any key to continue"
+				ENTER2CONTINUE
 				MISC_MENU;;
 			[Bb]) MISC_MENU;;
 			[Ii]) INSTALL_MENU;;
@@ -1015,36 +1006,21 @@ INSTALL_MENU() {
 		read -n 1 opt
 		echo
 		case $opt in
-			1) WEBMIN_INSTALL
-				INSTALL_MENU;;
-			2) GLANCES_INSTALL
-				INSTALL_MENU;;
-			3) X11VNC_INSTALL
-				INSTALL_MENU;;
-			4) FW_INSTALL
-				INSTALL_MENU;;
-			5) MYSQLBU_INSTALL
-				INSTALL_MENU;;
-			6) DSMON_INSTALL
-				INSTALL_MENU;;
-			7) IPERF_INSTALL
-				INSTALL_MENU;;
-			8) SPEEDTEST_INSTALL
-				INSTALL_MENU;;
-			9) BASHRC_INSTALL
-				INSTALL_MENU;;
-			0) LINUPX_UNINSTALL
-				INSTALL_MENU;;
-			[Uu]) URBACKUP_INSTALL
-				INSTALL_MENU;;
-			[Dd]) DSMON_INSTALL
-				INSTALL_MENU;;
-			[Pp]) POSTFIX_INSTALL
-				INSTALL_MENU;;
-			[Nn]) NETDATA_INSTALL
-				INSTALL_MENU;;
-			[Tt]) TAILSCALE_INSTALL
-				INSTALL_MENU;;
+			1) WEBMIN_INSTALL; INSTALL_MENU;;
+			2) GLANCES_INSTALL; INSTALL_MENU;;
+			3) X11VNC_INSTALL; INSTALL_MENU;;
+			4) FW_INSTALL; INSTALL_MENU;;
+			5) MYSQLBU_INSTALL; INSTALL_MENU;;
+			6) DSMON_INSTALL; INSTALL_MENU;;
+			7) IPERF_INSTALL; INSTALL_MENU;;
+			8) SPEEDTEST_INSTALL; INSTALL_MENU;;
+			9) BASHRC_INSTALL; INSTALL_MENU;;
+			0) LINUPX_UNINSTALL; INSTALL_MENU;;
+			[Uu]) URBACKUP_INSTALL; INSTALL_MENU;;
+			[Dd]) DSMON_INSTALL; INSTALL_MENU;;
+			[Pp]) POSTFIX_INSTALL; INSTALL_MENU;;
+			[Nn]) NETDATA_INSTALL; INSTALL_MENU;;
+			[Tt]) TAILSCALE_INSTALL; INSTALL_MENU;;
 			[Bb]) SCRIPT_MENU;;
 			[Mm]) MISC_MENU;;
 			[Qq]) EXIT1
@@ -1073,3 +1049,6 @@ else
 fi
 
 exit 0
+
+
+