From 4308d0dac2de2cd312949017d0d4be101c0b2155 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 9 Jul 2023 12:02:14 -0500 Subject: [PATCH] Update mm-scripts.sh --- mm-scripts.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm-scripts.sh b/mm-scripts.sh index 85c7db8..5f03843 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1065,28 +1065,20 @@ SERVICEBACKUP(){ [ "${MM_SERVICE_APP[$usrvc]}" != "" ] && APPBAKFOLDER=${MM_SERVICE_APP[$usrvc]} || APPBAKFOLDER=/opt/${usrvc^} if [ "${2}" == "-f" ] || [ $(expr `date +%s` - $(stat -c %Y ${LOGFOLDER}/update.${usrvc})) -gt 7776000 ] || ([ ! -f ${BACKUPDIR}/cfg.tgz ] && [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]) || ([ ! -f ${BACKUPDIR}/app.tgz ] && [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]); then - # NEWER="" - # NOW=`date +%d-%b` if [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]; then - # echo ${NOW} > ${BACKUPDIR}/full-date-apt - # /bin/tar ${NEWER} cf - -C ${APPBAKFOLDER}/* | pv -s $(du -sb ${APPBAKFOLDER} | awk '{print $1}') | gzip > ${BACKUPDIR}/app.tgz + rm -f ${BACKUPDIR}/snapshot-apt.snar tar -cpPg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app.tgz ${APPBAKFOLDER} fi if [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]; then - # echo ${NOW} > ${BACKUPDIR}/full-date-cfg - # /bin/tar ${NEWER} cf - -C ${MM_SERVICE_CFG[${usrvc}]}/* | pv -s $(du -sb ${MM_SERVICE_CFG[${usrvc}]} | awk '{print $1}') | gzip > ${BACKUPDIR}/cfg.tgz + rm -f ${BACKUPDIR}/snapshot-cfg.snar tar -cpPg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg.tgz ${MM_SERVICE_CFG[${usrvc}]} fi else if [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]; then - # NEWER="--newer `cat ${BACKUPDIR}/full-date-apt`" - # /bin/tar $NEWER cf - -C ${APPBAKFOLDER}/* | pv -s $(du -sb ${APPBAKFOLDER} | awk '{print $1}') | gzip > ${BACKUPDIR}/app.${NOW}.tgz tar -cpPg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app.$(date +%m-%d-%H-%M).tgz ${APPBAKFOLDER} fi if [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]; then - # NEWER="--newer `cat ${BACKUPDIR}/full-date-cfg`" - # /bin/tar $NEWER cf - -C ${MM_SERVICE_CFG[${usrvc}]}/* | pv -s $(du -sb ${MM_SERVICE_CFG[${usrvc}]} | awk '{print $1}') | gzip > ${BACKUPDIR}/cfg.${NOW}.tgz tar -cpPg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg.$(date +%m-%d-%H-%M).tgz ${MM_SERVICE_CFG[${usrvc}]} fi fi