From bec73d745c3f704ed8f8a11ddc42400697852725 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Dec 2023 23:09:40 -0600
Subject: [PATCH] update

---
 defaults.inc        | 4 ++--
 nodemgmt-scripts.sh | 2 +-
 run.sh              | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index a7d52a7a..6c164b80 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-VERS='4.16.35-12032023'
-NM_BETA=true
+VERS='4.16.36-12032023'
+NM_BETA=false
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index ad9bc546..4e4febc6 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -335,7 +335,7 @@ NODEUPDATES() {
 	if [ "${2}" != "sync" ]; then
 		c=0; spca=''; spc1=${cw}-25; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
 		echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca}  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
-		${NMCMD} "nodemgmt update q"
+		if [ "$(${NM_SCRIPT} betacheck)" == "false" ] && ${NMCMD} "nodemgmt update q" || echo -e "Skipping BETA Update"
 	fi
 	
 	echo
diff --git a/run.sh b/run.sh
index 51747a31..ba71be72 100755
--- a/run.sh
+++ b/run.sh
@@ -34,14 +34,15 @@ if [ "${1}" == "update" ]; then
 		# if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then
 		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
 			goforup=0
-			if [ "$(${NM_SCRIPT} betacheck)" == "true" ] && [ "${2}" != "q" ]; then
+			betacheck=$(${NM_SCRIPT} betacheck)
+			if [ "${betacheck}" == "true" ] && [ "${2}" != "q" ]; then
 				echo -en "\e[1A";
 				echo -en "\e[0K\r${idsCL[LightCyan]}This update is currently in BETA, proceed (N/y)? ${idsCL[Default]}"
 				read -n1 choice
 				case $choice in
 					[Yy]) echo; goforup=1;;
 				esac
-			elif [ "$(${NM_SCRIPT} betacheck)" == "true" ] && [ "${2}" == "q" ]; then
+			elif [ "${betacheck}" == "true" ] && [ "${2}" == "q" ]; then
 				goforup=0
 			else
 				goforup=1