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,23 +540,31 @@ 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 \ eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
${ENCRYPT} \ ${ENCRYPT} \
${DEST} >> ${LOGFILE} ${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} \ eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
${STATIC_OPTIONS} --force \ ${STATIC_OPTIONS} --force \
${ENCRYPT} \ ${ENCRYPT} \
${DEST} >> ${LOGFILE} ${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} \
@ -564,9 +572,9 @@ duplicity_backup()
${EXCLUDEROOT} \ ${EXCLUDEROOT} \
${ROOT} ${DEST} \ ${ROOT} ${DEST} \
>> ${LOGFILE} >> ${LOGFILE}
} || { } || {
BACKUP_ERROR=1 BACKUP_ERROR=1
} }
} }
setup_passphrase() setup_passphrase()