`54f1389a057dfc6d09dc2cbce95379afad610b44`

Author: zertrin <zertrin@gmail.com>
Committer: zertrin <zertrin@gmail.com>
Date: 2014-04-16 12:56 UTC

Message

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

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index 3123510f679a83f94d0d5d64b3486d4e2673b6e9..c5f6e749e599966cc5a4958db027029341435f32 100755
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -394,7 +394,7 @@ get_remote_file_size()
 6       fi
 7     ;;
 8     *)
 9-      SIZE="Information on remote file size unavailable."
10+      SIZE="unsupported by backend"
11     ;;
12   esac
13 
14@@ -505,7 +505,8 @@ EOF
15       sed -i -e '/^--*$/d' ${LOGFILE}
16       ;;
17   esac
18-  chown ${LOG_FILE_OWNER} ${LOGFILE}
19+
20+  [[ -n "${LOG_FILE_OWNER}" ]] && chown ${LOG_FILE_OWNER} ${LOGFILE}
21 }
22 
23 backup_this_script()
24@@ -729,6 +730,10 @@ echo -e "--------    END DUPLICITY-BACKUP SCRIPT    --------\n" >> ${LOGFILE}
25 
26 email_logfile
27 
28+# remove old logfiles
29+# stops them from piling up infinitely
30+[[ -n "${REMOVE_LOGS_OLDER_THAN}" ]] && find ${LOGDIR} -type f -mtime +"${REMOVE_LOGS_OLDER_THAN}" -delete
31+
32 if [ ${ECHO} ]; then
33   echo "TEST RUN ONLY: Check the logfile for command output."
34 fi