diff --git a/defaults.inc b/defaults.inc index 4f4681e..82aaa69 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.264-07012023' +VERS='3.9.1-07092023' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index d6de8b7..f45565c 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1065,16 +1065,16 @@ SERVICEBACKUP(){ [ "${MM_SERVICE_APP[$usrvc]}" != "" ] && APPBAKFOLDER=${MM_SERVICE_APP[$usrvc]} || APPBAKFOLDER=/opt/${usrvc^} if [ "${2}" == "-f" ] || - ([ ! -f ${BACKUPDIR}/cfg.tgz ] && [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]) || - ([ ! -f ${BACKUPDIR}/app.tgz ] && [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]) || + ([ ! -f ${BACKUPDIR}/cfg-full.tgz ] && [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]) || + ([ ! -f ${BACKUPDIR}/app-full.tgz ] && [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]) || ([ $(expr `date +%s` - $(stat -c %Y ${LOGFOLDER}/update.${usrvc})) -gt 604800 ] && [ $(expr `date +%s` - $(stat -c %Y ${BACKUPDIR}/fullbackup)) -gt 7776000 ]); then if [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]; then rm -f ${BACKUPDIR}/snapshot-apt.snar - tar -cpPg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app.tgz ${APPBAKFOLDER} + tar -cpPg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app-full.tgz ${APPBAKFOLDER} fi if [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]; then rm -f ${BACKUPDIR}/snapshot-cfg.snar - tar -cpPg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg.tgz ${MM_SERVICE_CFG[${usrvc}]} + tar -cpPg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg-full.tgz ${MM_SERVICE_CFG[${usrvc}]} fi touch ${BACKUPDIR}/fullbackup else @@ -1087,10 +1087,10 @@ SERVICEBACKUP(){ fi for BAKFILE in ${BACKUPDIR}/app.*.tgz; do - [ ${BACKUPDIR}/app.tgz -nt ${BAKFILE} ] && rm -f ${BAKFILE} + [ ${BACKUPDIR}/app-full.tgz -nt ${BAKFILE} ] && rm -f ${BAKFILE} done for BAKFILE in ${BACKUPDIR}/cfg.*.tgz; do - [ ${BACKUPDIR}/cfg.tgz -nt ${BAKFILE} ] && rm -f ${BAKFILE} + [ ${BACKUPDIR}/cfg-full.tgz -nt ${BAKFILE} ] && rm -f ${BAKFILE} done echo -e "${idsCL[Green]}Done${idsCL[Default]}"