f9c07e28fa48fee5f6057e10966d5c3527a8574a

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

Fix shellcheck SC2153 and SC1090

Diff

 1diff --git a/.travis.yml b/.travis.yml
 2index 26d3e16718056019f06e30ba29274cc458e739a3..7cc5202f0333a32c79a3259a17e8ab3667180e3f 100644
 3--- a/.travis.yml
 4+++ b/.travis.yml
 5@@ -11,8 +11,7 @@ addons:
 6     - shellcheck
 7 
 8 script:
 9-    - shellcheck -e SC2153 -e SC2166 -e SC1090 duplicity-backup.sh
10-    - shellcheck -e SC2034 duplicity-backup.conf.example
11+    - shellcheck -e SC2034 -e SC2166 duplicity-backup.sh duplicity-backup.conf.example
12 
13 matrix:
14   fast_finish: true
15diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
16index c2bfaa21ea3629d85f200e2b860ddea2e71be9b4..cd74d805c9564cf9fa69b5796619ff961f11fb5b 100644
17--- a/duplicity-backup.conf.example
18+++ b/duplicity-backup.conf.example
19@@ -60,7 +60,7 @@
20 #       See the `STATIC_OPTIONS`, `CLEAN_UP_TYPE` and `CLEAN_UP_VARIABLE` parameters in particular.
21 #
22 #     * Before asking something about duplicity-backup.sh, ensure that your question
23-#       isn’t actually concerning duplicity ;)
24+#       isn't actually concerning duplicity ;)
25 #       First, make sure you can perform a backup with duplicity without using this script.
26 #       If you can't make the backup work with duplicity alone, the problem is probably
27 #       concerning duplicity and not this script. If you manage to make a backup with duplicity
28@@ -122,7 +122,7 @@ DEST="s3+http://foobar-backup-bucket/backup-folder/"
29 # ------------------------------------------------------------------------------
30 # Instead of setting the password needed for the backup destination in the
31 # DEST url, you can supply it in the FTP_PASSWORD variable below, which is
32-# used by most, if not all backends, regardless of it’s name.
33+# used by most, if not all backends, regardless of its name.
34 # Duplicity's official documentation states:
35 #   "Supported by most backends which are password capable. More secure than
36 #    setting it in the backend url (which might be readable in the operating
37@@ -335,7 +335,7 @@ CLEAN_UP_VARIABLE="4"
38 # (a full backup every 7 days), and you execute duplicity-backup once a day.
39 # After six months you'll have 25 full backups, each with daily incrementals
40 # in between. Perhaps you're keeping the backups past 1 month "just in case",
41-# and so the older incrementals are overkill – weekly full backups beyond
42+# and so the older incrementals are overkill - weekly full backups beyond
43 # one month backward would suffice. In this case you can set
44 # "REMOVE_INCREMENTALS_OLDER_THAN to, say, "4" which will delete the
45 # incrementals for backup sets beyond the four most recent, keeping
46diff --git a/duplicity-backup.sh b/duplicity-backup.sh
47index b37b76ac56c4125e5f4936518870ab4106874173..37694882b29968ea8f078b6903d0e8780f36da0e 100755
48--- a/duplicity-backup.sh
49+++ b/duplicity-backup.sh
50@@ -169,6 +169,7 @@ done
51 # Read config file if specified
52 if [ ! -z "${CONFIG}" -a -f "${CONFIG}" ];
53 then
54+  # shellcheck source=duplicity-backup.conf.example
55   . "${CONFIG}"
56 else
57   echo "ERROR: can't find config file! (${CONFIG})" >&2