diff --git a/defaults.inc b/defaults.inc index 6ef9c27..1a128f8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.9.86-09302024' +VERS='3.10.1-09302024' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index 4d3367b..2844430 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -78,8 +78,8 @@ MMSTART(){ elif [ "${1}" == "check" ] && [ "$(/bin/ip link | grep "${VPN_INTERFACE}")" == "" ] && [ ! -f ${TMPFOLDER}/mm.vpn* ] && [ ! -f ${TMPFOLDER}/vpninfo.* ]; then GOFORSTART=true; - SENDNOTICE "Starting Media Management Systems" "Fresh Startup" - echo "$(date) - Starting Media Management system - (fresh start)" >> ${MM_LOGFILE} + [ ! -f ${MMFOLDER}/mm.noservices ] && SENDNOTICE "Starting MM/VPN Systems" "Fresh Startup" + echo "$(date) - Starting MM/VPN system - (fresh start)" >> ${MM_LOGFILE} echo -e "${idsCL[LightCyan]}Fresh Startup${idsCL[Default]}" elif [ "${1}" = "check" ] && [ "$(/bin/ip link | grep "${VPN_INTERFACE}")" = "" ] && [ -f ${TMPFOLDER}/mm.vpn* ]; then @@ -150,7 +150,7 @@ MMSTART(){ exit 1 elif [ -f ${TMPFOLDER}/mm.vpn.fail2 ]; then echo -e "${idsCL[Red]} failed, shutting down system${idsCL[Default]}" - echo "$(date) - VPN Failure #3 - Shutting down Media Management systems" >> ${MM_LOGFILE} + echo "$(date) - VPN Failure #3 - Shutting down MM/VPN systems" >> ${MM_LOGFILE} SENDNOTICE "VPN Failure" "Final Failure, shutting down system" 2 MMSTOP [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -492,7 +492,7 @@ MMSTART(){ if [ "${1}" == "start" ] || [ "${1}" == "restart" ]; then #echo -e "${idsCL[LightCyan]}It may take a couple of minutes before all services fully start${idsCL[Default]}" - echo "$(date) - Media Management systems STARTED" >> ${MM_LOGFILE} + echo "$(date) - MM/VPN systems STARTED" >> ${MM_LOGFILE} MMSTATUS fi if [ -f ${TMPFOLDER}/mm.vpn.fail* ]; then @@ -599,7 +599,7 @@ MMSTOP(){ rm -f ${TMPFOLDER}/mm.plexmount.fail* rm -f ${TMPFOLDER}/mm.stop.checking - echo "$(date) - Media Management systems STOPPED" >> ${MM_LOGFILE} + echo "$(date) - MM/VPN systems STOPPED" >> ${MM_LOGFILE} echo echo -e "${idsCL[Red]}All services have been stopped${idsCL[Default]}" @@ -1333,7 +1333,7 @@ SHOWSRVCUPDATES(){ } MMSETUP(){ - echo -e "${idsCL[Green]}Media Manager Setup Scripts${idsCL[Default]}" + echo -e "${idsCL[Green]}MM/VPN Manager Setup Scripts${idsCL[Default]}" echo MMSTOP @@ -1440,7 +1440,7 @@ MMSETUP(){ # fi # if [ "${SERVICESCHECK}" == "" ] && [ "${srvcs}" == "" ]; then export NEWT_COLORS='' - srvcs=$(whiptail --title "Media Manager Service Selector" --checklist --separate-output \ + srvcs=$(whiptail --title "MM/VPN Manager Service Selector" --checklist --separate-output \ "\nPlease select which services to enable for this system:" 0 70 16 \ "bazarr" "Bazarr (Subtitle Manager)" ON \ "jackett" "Jackett (Torrent Indexing Manager) " OFF \ @@ -1663,7 +1663,7 @@ MMSETUP(){ fi echo - echo -e "${idsCL[LightCyan]}The following are Media Manager (mm) usage commands:${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}The following are MM/VPN Manager (mm) usage commands:${idsCL[Default]}" DIVIDER . lightGreen USAGE