Diff
1diff --git a/AUTHORS b/AUTHORS
2index 44851d592c1f93e722332e01cb1e10424838af3f..7f38bdf856d37bef91b464c9b7fe33ef33d08d98 100644
3--- a/AUTHORS
4+++ b/AUTHORS
5@@ -1,4 +1,5 @@
6-Damon Timm <damontimm@gmail.com> <http://blog.damontimm.com>
7+Damon Timm <damontimm@gmail.com> <http://blog.damontimm.com>
8 Mario Santagiuliana <mario@marionline.it> <http://www.marionline.it>
9-Razvan Marescu <rmarescu+github@gmail.com> <http://github.com/rmarescu>
10-Marc Gallet <gmarc34@gmail.com> <http://github.com/zertrin>
11+Razvan Marescu <rmarescu+github@gmail.com> <https://github.com/rmarescu>
12+Marc Gallet <zertrin@gmail.com> <https://github.com/zertrin>
13+All commit contributors https://github.com/zertrin/duplicity-backup/graphs/contributors
14diff --git a/duplicity-backup.sh b/duplicity-backup.sh
15index c8927d13d74d19f26f0daa914694f9eeb2e24f1d..f658dfbcb5f6714e048b92d3c0eb34ba07460378 100644
16--- a/duplicity-backup.sh
17+++ b/duplicity-backup.sh
18@@ -283,8 +283,8 @@ check_variables ()
19 {
20 [[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured"
21 [[ ${DEST} = "" || ${DEST} = "s3+http://backup-foobar-bucket/backup-folder/" ]] && config_sanity_fail "DEST must be configured"
22- [[ ${INCLIST} = "/home/foobar_user_name/Documents/" ]] && config_sanity_fail "INCLIST must be configured"
23- [[ ${EXCLIST} = "/home/foobar_user_name/Documents/foobar-to-exclude" ]] && config_sanity_fail "EXCLIST must be configured"
24+ [[ ${INCLIST} = "/home/foobar_user_name/Documents/" ]] && config_sanity_fail "INCLIST must be configured"
25+ [[ ${EXCLIST} = "/home/foobar_user_name/Documents/foobar-to-exclude" ]] && config_sanity_fail "EXCLIST must be configured"
26 [[ ( ${ENCRYPTION} = "yes" && (${GPG_ENC_KEY} = "foobar_gpg_key" || \
27 ${GPG_SIGN_KEY} = "foobar_gpg_key" || \
28 ${PASSPHRASE} = "foobar_gpg_passphrase")) ]] && \
29@@ -412,7 +412,7 @@ get_source_file_size()
30 awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
31 >> ${LOGFILE}
32 done
33-
34+
35 echo >> ${LOGFILE}
36
37 # Restore IFS
38@@ -492,7 +492,7 @@ include_exclude()
39 TMP=" --exclude-device-files"
40 EXCLUDE=$EXCLUDE$TMP
41 fi
42-
43+
44 for include in ${INCLIST[@]}
45 do
46 TMP=" --include=""'"$include"'"
47@@ -504,21 +504,21 @@ include_exclude()
48 TMP=" --exclude ""'"$exclude"'"
49 EXCLUDE=$EXCLUDE$TMP
50 done
51-
52+
53 # Include/Exclude globbing filelist
54 if [ "$INCEXCFILE" != '' ]; then
55 TMP=" --include-globbing-filelist ""'"$INCEXCFILE"'"
56 INCLUDE=$INCLUDE$TMP
57 fi
58-
59+
60 # INCLIST and globbing filelist is empty so every file needs to be saved
61 if [ "$INCLIST" == '' ] && [ "$INCEXCFILE" == '' ]; then
62 EXCLUDEROOT=''
63 else
64 EXCLUDEROOT="--exclude=**"
65 fi
66-
67-
68+
69+
70 # Restore IFS
71 IFS=$OLDIFS
72 }
73@@ -538,7 +538,7 @@ duplicity_cleanup()
74 ${ENCRYPT} \
75 ${DEST} >> ${LOGFILE}
76 echo >> ${LOGFILE}
77- fi
78+ fi
79 }
80
81 duplicity_backup()