From ad2f5daedf803865ce415834247b7393c719a838 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 28 May 2025 18:56:07 -0500
Subject: [PATCH] update

---
 defaults.inc  |  4 ++++
 mm-scripts.sh | 11 +++++++++++
 run.sh        |  3 +++
 3 files changed, 18 insertions(+)

diff --git a/defaults.inc b/defaults.inc
index 34eea57..7f9abac 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -9,6 +9,10 @@ LOGFOLDER="${MMFOLDER}/logs"
 [ ! -d ${LOGFOLDER} ] && mkdir ${LOGFOLDER}
 MMSRV=$(/bin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
 
+NM_FOLDER="/opt/idssys/nodemgmt"
+[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && source ${NM_FOLDER}/defaults.inc
+
+
 AVAILSERVICES=bazarr,jackett,lidarr,ombi,snap.overseerr.daemon,prowlarr,qbittorrent,radarr,radarr3d,readarr,sonarr,snap.tautulli.tautulli
 UPDATESERVICES=bazarr,jackett,lidarr,ombi,organizr,prowlarr,qbittorrent,radarr,readarr,sonarr
 BETA_SERVICES=" readarr "
diff --git a/mm-scripts.sh b/mm-scripts.sh
index 0d5afc5..75965f4 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -9,6 +9,7 @@ VERBOSE=true
 source /opt/idssys/defaults/default.inc
 source /opt/idssys/mediamanager/settings.conf
 source /opt/idssys/mediamanager/defaults.inc
+
 [ -f ${TMPFOLDER}/realwanip ] && source ${TMPFOLDER}/realwanip
 [ -f ${TMPFOLDER}/vers.info ] && source ${TMPFOLDER}/vers.info
 [ "${GITBRANCH}" != "" ] && GBRANCH="${GITBRANCH}" || GBRANCH="master"
@@ -138,6 +139,7 @@ MMSTART(){
 			# "${VPN_START[@]}" >/dev/null 2>&1
 			# sleep 10s
 			rm -f ${TMPFOLDER}/mm.stop*
+			rm -f ${NM_FOLDER}/.tmp/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1
 		elif [ -f ${TMPFOLDER}/mm.vpn.fail2 ]; then
@@ -157,6 +159,7 @@ MMSTART(){
 			# "${VPN_START[@]}" >/dev/null 2>&1
 			# sleep 10s
 			rm -f ${TMPFOLDER}/mm.stop*
+			rm -f ${NM_FOLDER}/.tmp/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1
 		fi
@@ -272,6 +275,7 @@ MMSTART(){
 				# "${VPN_START[@]}" >/dev/null 2>&1
 				# sleep 10s
 				rm -f ${TMPFOLDER}/mm.stop*
+				rm -f ${NM_FOLDER}/.tmp/mm.stop*
 				[ $VERBOSE = true ] && DEBUGLOGSTOP
 				exit 1
 			fi
@@ -303,6 +307,7 @@ MMSTART(){
 				# "${VPN_START[@]}" >/dev/null 2>&1
 				# sleep 10s
 				rm -f ${TMPFOLDER}/mm.stop*
+				rm -f ${NM_FOLDER}/.tmp/mm.stop*
 				[ $VERBOSE = true ] && DEBUGLOGSTOP
 				exit 1
 			fi
@@ -324,6 +329,7 @@ MMSTART(){
 			# "${VPN_START[@]}" >/dev/null 2>&1
 			# sleep 10s
 			rm -f ${TMPFOLDER}/mm.stop*
+			rm -f ${NM_FOLDER}/.tmp/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1
 		fi
@@ -493,6 +499,7 @@ MMSTART(){
 			rm -f ${TMPFOLDER}/mm.vpn.fail*
 		fi
 		rm -f ${TMPFOLDER}/mm.stop*
+		rm -f ${NM_FOLDER}/.tmp/mm.stop*
 		echo -e "${idsCL[Green]}All systems are go!${idsCL[Default]}"
 
 	fi
@@ -512,6 +519,7 @@ MMSTOP(){
 	fi
 	echo
 	touch ${TMPFOLDER}/mm.stop
+	touch ${NM_FOLDER}/.tmp/mm.stop
 	
 	# echo -en "${idsCL[LightCyan]}Stopping background MM scripts... ${idsCL[Default]}"
 	# getMMbash=$(pgrep -f '/mm')
@@ -598,6 +606,7 @@ MMSTOP(){
 	fi
 	echo
 	touch ${TMPFOLDER}/mm.stop
+	touch ${NM_FOLDER}/.tmp/mm.stop
 }
 FULLSTOP(){
 	echo -en "${idsCL[LightCyan]}Stopping any background MM scripts still running... ${idsCL[Default]}"
@@ -1750,10 +1759,12 @@ if [ ! -f ${TMPFOLDER}/mm.update.stop ]; then
 				checkstopped=`expr $(date +%s) - $(stat -c %Y ${TMPFOLDER}/mm.stop.checking)`
 				if [ $checkstopped -gt 900 ]; then
 					rm -f ${TMPFOLDER}/mm.stop*
+					rm -f ${NM_FOLDER}/.tmp/mm.stop*
 					echo "$(date) - Bash script stuck in stop mode after doing a check, will restart" >> ${MM_LOGFILE}
 					SENDNOTICE "MM Script Error" "Bash script stuck in check mode, restarting system"
 					MMSTOP
 					rm -f ${TMPFOLDER}/mm.stop*
+					rm -f ${NM_FOLDER}/.tmp/mm.stop*
 					getStuckMM=$(pgrep -f '/mm')
 					for i in $getStuckMM; do
 						/bin/kill $i
diff --git a/run.sh b/run.sh
index cad441d..9545179 100755
--- a/run.sh
+++ b/run.sh
@@ -86,14 +86,17 @@ if [ "${1}" == "clear" ]; then
 	else
 		rm -f ${TMPFOLDER}/*
 		touch ${TMPFOLDER}/mm.stop
+		touch ${NM_FOLDER}/.tmp/mm.stop
 	fi
 fi
 if [ -f ${TMPFOLDER}/mm.stop.checking ]; then
 	#fd=$(expr $(date +%s) - $(stat -L --format %Y ${TMPFOLDER}/mm.stop.checking))
 	if [ $(expr $(date +%s) - $(stat -L --format %Y ${TMPFOLDER}/mm.stop.checking)) -gt 900 ]; then
 		rm -f ${TMPFOLDER}/mm.stop*
+		rm -f ${NM_FOLDER}/.tmp/mm.stop*
 	elif [ "${1}" = "check" ] && [ "$(ip link | grep "${VPN_INTERFACE}")" = "" ] && [ ! -f ${TMPFOLDER}/mm.vpn* ] && [ $(uptime_minutes) -lt 3 ]; then
 		rm -f ${TMPFOLDER}/mm.stop*
+		rm -f ${NM_FOLDER}/.tmp/mm.stop*
 		
 	elif [[ "${allowrun}" != *" ${1} "* ]] && [ "${1}" != "" ]; then
 		echo -e "${idsCL[LightCyan]}Try again later, 'mm' program currently in use...${idsCL[Default]}"