Merge commit '9f5626bd19' from jbernhard/duplicity-backup into dev

This commit is contained in:
zertrin 2014-04-16 14:56:14 +02:00
commit 54f1389a05

View file

@ -394,7 +394,7 @@ get_remote_file_size()
fi fi
;; ;;
*) *)
SIZE="Information on remote file size unavailable." SIZE="unsupported by backend"
;; ;;
esac esac
@ -505,7 +505,8 @@ EOF
sed -i -e '/^--*$/d' ${LOGFILE} sed -i -e '/^--*$/d' ${LOGFILE}
;; ;;
esac esac
chown ${LOG_FILE_OWNER} ${LOGFILE}
[[ -n "${LOG_FILE_OWNER}" ]] && chown ${LOG_FILE_OWNER} ${LOGFILE}
} }
backup_this_script() backup_this_script()
@ -729,6 +730,10 @@ echo -e "-------- END DUPLICITY-BACKUP SCRIPT --------\n" >> ${LOGFILE}
email_logfile email_logfile
# remove old logfiles
# stops them from piling up infinitely
[[ -n "${REMOVE_LOGS_OLDER_THAN}" ]] && find ${LOGDIR} -type f -mtime +"${REMOVE_LOGS_OLDER_THAN}" -delete
if [ ${ECHO} ]; then if [ ${ECHO} ]; then
echo "TEST RUN ONLY: Check the logfile for command output." echo "TEST RUN ONLY: Check the logfile for command output."
fi fi