From c4a8f5465ba6009d289eab9cbedf6d4a401845b6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 28 May 2025 21:27:58 -0500 Subject: [PATCH] update --- defaults.inc | 6 +++--- mm-scripts.sh | 20 ++++++++++---------- run.sh | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/defaults.inc b/defaults.inc index 769adcc..9abae75 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.10.6-05282025' +VERS='3.10.7-05282025' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" @@ -9,8 +9,8 @@ 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 +# 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 diff --git a/mm-scripts.sh b/mm-scripts.sh index 75965f4..e29a6a0 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -139,7 +139,7 @@ MMSTART(){ # "${VPN_START[@]}" >/dev/null 2>&1 # sleep 10s rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP exit 1 elif [ -f ${TMPFOLDER}/mm.vpn.fail2 ]; then @@ -159,7 +159,7 @@ MMSTART(){ # "${VPN_START[@]}" >/dev/null 2>&1 # sleep 10s rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP exit 1 fi @@ -275,7 +275,7 @@ MMSTART(){ # "${VPN_START[@]}" >/dev/null 2>&1 # sleep 10s rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP exit 1 fi @@ -307,7 +307,7 @@ MMSTART(){ # "${VPN_START[@]}" >/dev/null 2>&1 # sleep 10s rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP exit 1 fi @@ -329,7 +329,7 @@ MMSTART(){ # "${VPN_START[@]}" >/dev/null 2>&1 # sleep 10s rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP exit 1 fi @@ -499,7 +499,7 @@ MMSTART(){ rm -f ${TMPFOLDER}/mm.vpn.fail* fi rm -f ${TMPFOLDER}/mm.stop* - rm -f ${NM_FOLDER}/.tmp/mm.stop* + # rm -f ${NM_FOLDER}/.tmp/mm.stop* echo -e "${idsCL[Green]}All systems are go!${idsCL[Default]}" fi @@ -519,7 +519,7 @@ MMSTOP(){ fi echo touch ${TMPFOLDER}/mm.stop - touch ${NM_FOLDER}/.tmp/mm.stop + # touch ${NM_FOLDER}/.tmp/mm.stop # echo -en "${idsCL[LightCyan]}Stopping background MM scripts... ${idsCL[Default]}" # getMMbash=$(pgrep -f '/mm') @@ -606,7 +606,7 @@ MMSTOP(){ fi echo touch ${TMPFOLDER}/mm.stop - touch ${NM_FOLDER}/.tmp/mm.stop + # touch ${NM_FOLDER}/.tmp/mm.stop } FULLSTOP(){ echo -en "${idsCL[LightCyan]}Stopping any background MM scripts still running... ${idsCL[Default]}" @@ -1759,12 +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* + # 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* + # 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 9545179..a9019f9 100755 --- a/run.sh +++ b/run.sh @@ -86,17 +86,17 @@ if [ "${1}" == "clear" ]; then else rm -f ${TMPFOLDER}/* touch ${TMPFOLDER}/mm.stop - touch ${NM_FOLDER}/.tmp/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* + # 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* + # 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]}"