diff --git a/mm-scripts.sh b/mm-scripts.sh index edd4bec..1e53547 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1065,25 +1065,29 @@ SERVICEBACKUP(){ [ "${MM_SERVICE_APP[$usrvc]}" != "" ] && APPBAKFOLDER=${MM_SERVICE_APP[$usrvc]} || APPBAKFOLDER=/opt/${usrvc^} if [ $(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` + # NEWER="" + # NOW=`date +%d-%b` if [ "${MM_SERVICE_APP[$usrvc]}" != "none" ]; then - echo ${NOW} > ${BACKUPDIR}/app-full-date - /bin/tar ${NEWER} cf - -C ${APPBAKFOLDER} | pv -s $(du -sb ${APPBAKFOLDER} | awk '{print $1}') | gzip > ${BACKUPDIR}/app.tgz + # echo ${NOW} > ${BACKUPDIR}/full-date-apt + # /bin/tar ${NEWER} cf - -C ${APPBAKFOLDER}/* | pv -s $(du -sb ${APPBAKFOLDER} | awk '{print $1}') | gzip > ${BACKUPDIR}/app.tgz + tar -cpPfg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app.tgz ${APPBAKFOLDER} fi if [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]; then - echo ${NOW} > ${BACKUPDIR}/cfg-full-date - /bin/tar ${NEWER} cf - -C ${MM_SERVICE_CFG[${usrvc}]} | pv -s $(du -sb ${MM_SERVICE_CFG[${usrvc}]} | awk '{print $1}') | gzip > ${BACKUPDIR}/cfg.tgz + # 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 + tar -cpPfg ${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}/app-full-date`" - /bin/tar $NEWER cf - -C ${APPBAKFOLDER}/* | pv -s $(du -sb ${APPBAKFOLDER} | awk '{print $1}') | gzip > ${BACKUPDIR}/app.${NOW}.tgz + # 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 -cpPfg ${BACKUPDIR}/snapshot-apt.snar -f ${BACKUPDIR}/app.$(date +%d-%b).tgz ${APPBAKFOLDER} fi if [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ]; then - NEWER="--newer `cat ${BACKUPDIR}/cfg-full-date`" - /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 + # 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 -cpPfg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg.$(date +%d-%b).tgz ${MM_SERVICE_CFG[${usrvc}]} fi fi