also send email on cleanup failure + replace introduced tabs with spaces

This commit is contained in:
zertrin 2015-10-08 10:15:56 +02:00
parent 8985d9c432
commit e5d57852ce

View file

@ -540,33 +540,41 @@ duplicity_cleanup()
{ {
echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE} echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE}
if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then
eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \ {
${ENCRYPT} \ eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
${DEST} >> ${LOGFILE} ${ENCRYPT} \
${DEST} >> ${LOGFILE}
} || {
BACKUP_ERROR=1
}
echo >> ${LOGFILE} echo >> ${LOGFILE}
fi fi
if [ ! -z ${REMOVE_INCREMENTALS_OLDER_THAN} ] && [[ ${REMOVE_INCREMENTALS_OLDER_THAN} =~ ^[0-9]+$ ]]; then if [ ! -z ${REMOVE_INCREMENTALS_OLDER_THAN} ] && [[ ${REMOVE_INCREMENTALS_OLDER_THAN} =~ ^[0-9]+$ ]]; then
eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \ {
${STATIC_OPTIONS} --force \ eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
${ENCRYPT} \ ${STATIC_OPTIONS} --force \
${DEST} >> ${LOGFILE} ${ENCRYPT} \
${DEST} >> ${LOGFILE}
} || {
BACKUP_ERROR=1
}
echo >> ${LOGFILE} echo >> ${LOGFILE}
fi fi
} }
duplicity_backup() duplicity_backup()
{ {
{ {
eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \ eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
${ENCRYPT} \ ${ENCRYPT} \
${EXCLUDE} \ ${EXCLUDE} \
${INCLUDE} \ ${INCLUDE} \
${EXCLUDEROOT} \ ${EXCLUDEROOT} \
${ROOT} ${DEST} \ ${ROOT} ${DEST} \
>> ${LOGFILE} >> ${LOGFILE}
} || { } || {
BACKUP_ERROR=1 BACKUP_ERROR=1
} }
} }
setup_passphrase() setup_passphrase()
@ -838,17 +846,17 @@ echo -e "--------- END DUPLICITY-BACKUP SCRIPT ---------\n" >> ${LOGFILE}
if [ ${EMAIL_FAILURE_ONLY} == "yes" ] if [ ${EMAIL_FAILURE_ONLY} == "yes" ]
then then
if [ ${BACKUP_ERROR} ]; then if [ ${BACKUP_ERROR} ]; then
EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}" EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
email_logfile email_logfile
fi fi
else else
if [ ${BACKUP_ERROR} ]; then if [ ${BACKUP_ERROR} ]; then
EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}" EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
else else
EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}" EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
fi fi
email_logfile email_logfile
fi fi
# remove old logfiles # remove old logfiles