diff --git a/defaults.inc b/defaults.inc index 83303d0..e81eb3b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -4,7 +4,9 @@ VERS='3.8.227-05272023' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" +LOGFOLDER="${MMFOLDER}/logs" [ ! -d ${TMPFOLDER} ] && mkdir ${TMPFOLDER} +[ ! -d ${LOGFOLDER} ] && mkdir ${LOGFOLDER} MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) AVAILSERVICES=bazarr,jackett,lidarr,ombi,snap.overseerr.daemon,qbittorrent,radarr,radarr3d,sonarr,snap.tautulli.tautulli @@ -19,8 +21,8 @@ unset IFS noheader=' check noup update update-organizr ' allowrun=' status update stop vpninfo ' -logfile=${MMFOLDER}/logs/logfile -outputlogfile=${MMFOLDER}/logs/outputs.check.log +logfile=${LOGFOLDER}/logfile +outputlogfile=${LOGFOLDER}/outputs.check.log [ ! -f ${logfile} ] && touch $logfile [ ! -f ${outputlogfile} ] && touch $outputlogfile [ ! -d /opt/Backups ] && mkdir /opt/Backups diff --git a/mm-scripts.sh b/mm-scripts.sh index d9d60cb..e7721e6 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -897,8 +897,8 @@ UPDATESERVICE(){ if [ "${!cver}" != "${latest_ver}" ] || [ "${3}" == "-f" ]; then [ "${3}" == "-f" ] && echo -e "${idsCL[LightCyan]}Update Not Needed, forcing anyway${idsCL[Default]}" || echo -e "${idsCL[Green]}Update Available${idsCL[Default]}" - # rm -f ${MMFOLDER}/logs/update.${usrvc} - touch ${MMFOLDER}/logs/update.${usrvc} + # rm -f ${LOGFOLDER}/update.${usrvc} + touch ${LOGFOLDER}/update.${usrvc} SERVICEBACKUP ${usrvc} @@ -908,21 +908,21 @@ UPDATESERVICE(){ echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" if curl --output /dev/null --silent --head --fail $latest_release_url; then - wget -qO ${tmpfile} $latest_release_url >> ${MMFOLDER}/logs/update.${usrvc} + wget -qO ${tmpfile} $latest_release_url >> ${LOGFOLDER}/update.${usrvc} if [[ ( $? -eq 0 ) && ( -f ${tmpfile} ) ]]; then if [ "${usrvc}" != "bazarr" ]; then - rm -Rf /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - mkdir /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + rm -Rf /opt/${usrvc^} >> ${LOGFOLDER}/update.${usrvc} + mkdir /opt/${usrvc^} >> ${LOGFOLDER}/update.${usrvc} fi if [ "${usrvc}" == "ombi" ]; then - /bin/tar xfP ${tmpfile} -C /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + /bin/tar xfP ${tmpfile} -C /opt/${usrvc^} >> ${LOGFOLDER}/update.${usrvc} elif [ "${usrvc}" == "bazarr" ]; then /usr/bin/unzip -oqq ${tmpfile} -d /opt/${usrvc^} else - /bin/tar xfP ${tmpfile} -C /opt >> ${MMFOLDER}/logs/update.${usrvc} + /bin/tar xfP ${tmpfile} -C /opt >> ${LOGFOLDER}/update.${usrvc} fi - chown -R user:users /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + chown -R user:users /opt/${usrvc^} >> ${LOGFOLDER}/update.${usrvc} fi fi @@ -990,16 +990,16 @@ SERVICEBACKUP(){ usrvc=${1} msg="Stopping Service and Backing Up"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" - /bin/systemctl stop ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} - [ "${usrvc}" == "radarr" ] && /bin/systemctl stop radarr3d >> ${MMFOLDER}/logs/update.${usrvc} + /bin/systemctl stop ${usrvc} >> ${LOGFOLDER}/update.${usrvc} + [ "${usrvc}" == "radarr" ] && /bin/systemctl stop radarr3d >> ${LOGFOLDER}/update.${usrvc} tmpfile=/tmp/${usrvc}-update.tar.gz bak=/opt/Backups/${usrvc}.opt.tgz bakcfg=/opt/Backups/${usrvc}.cfg.tgz [[ -f ${bak} ]] && rm -f "${bak}" &>/dev/null [[ -f ${tmpfile} ]] && rm -f "${tmpfile}" &>/dev/null [ "${MM_SERVICE_APP[$usrvc]}" != "" ] && bkfldr=${MM_SERVICE_APP[$usrvc]} || bkfldr=/opt/${usrvc^} - [ "${MM_SERVICE_APP[$usrvc]}" != "none" ] && /bin/tar -cpPf $bak ${bkfldr} >> ${MMFOLDER}/logs/update.${usrvc} - [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ] && /bin/tar -cpPf $bakcfg ${MM_SERVICE_CFG[${usrvc}]} >> ${MMFOLDER}/logs/update.${usrvc} + [ "${MM_SERVICE_APP[$usrvc]}" != "none" ] && /bin/tar -cpPf $bak ${bkfldr} >> ${LOGFOLDER}/update.${usrvc} + [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ] && /bin/tar -cpPf $bakcfg ${MM_SERVICE_CFG[${usrvc}]} >> ${LOGFOLDER}/update.${usrvc} echo -e "${idsCL[Green]}Done${idsCL[Default]}" } SERVICEBACKUPSTART(){ @@ -1007,9 +1007,9 @@ SERVICEBACKUPSTART(){ echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1 if [ ! -f ${TMPFOLDER}/mm.stop ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then - /bin/systemctl disable ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} - /bin/systemctl start ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} - [ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${MMFOLDER}/logs/update.${usrvc} + /bin/systemctl disable ${usrvc} >> ${LOGFOLDER}/update.${usrvc} + /bin/systemctl start ${usrvc} >> ${LOGFOLDER}/update.${usrvc} + [ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${LOGFOLDER}/update.${usrvc} echo -e "${idsCL[Green]}Done${idsCL[Default]}" else echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}"