diff --git a/mm-scripts.sh b/mm-scripts.sh index 9bcd22a..85c7db8 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1064,7 +1064,7 @@ SERVICEBACKUP(){ [ ! -d ${BACKUPDIR} ] && mkdir -p ${BACKUPDIR} [ "${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 + 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 @@ -1082,12 +1082,12 @@ SERVICEBACKUP(){ 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 +%d-%b).tgz ${APPBAKFOLDER} + 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 +%d-%b).tgz ${MM_SERVICE_CFG[${usrvc}]} + tar -cpPg ${BACKUPDIR}/snapshot-cfg.snar -f ${BACKUPDIR}/cfg.$(date +%m-%d-%H-%M).tgz ${MM_SERVICE_CFG[${usrvc}]} fi fi