73adf5dc99f98c0129d1c12a155187a13e36541a

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

Message

Fixes related to new warnings coming from the new version of shellcheck

Diff

 1diff --git a/.travis.yml b/.travis.yml
 2index 875f889ccbe0dea300c8a7efec0f00e750169a23..26d3e16718056019f06e30ba29274cc458e739a3 100644
 3--- a/.travis.yml
 4+++ b/.travis.yml
 5@@ -11,8 +11,8 @@ addons:
 6     - shellcheck
 7 
 8 script:
 9-  - shellcheck -e SC2153 duplicity-backup.sh
10-  - shellcheck -e SC2034 duplicity-backup.conf.example
11+    - shellcheck -e SC2153 -e SC2166 -e SC1090 duplicity-backup.sh
12+    - shellcheck -e SC2034 duplicity-backup.conf.example
13 
14 matrix:
15   fast_finish: true
16diff --git a/duplicity-backup.sh b/duplicity-backup.sh
17index c911657c2c7176ddb29228fc1188fe7237f8302e..b37b76ac56c4125e5f4936518870ab4106874173 100755
18--- a/duplicity-backup.sh
19+++ b/duplicity-backup.sh
20@@ -724,7 +724,7 @@ backup_this_script()
21   echo "Backup tarball will be encrypted and saved to: $(pwd)/${TMPFILENAME}"
22   echo
23   echo ">> Are you sure you want to do that ('yes' to continue)?"
24-  read ANSWER
25+  read -r ANSWER
26   if [ "${ANSWER}" != "yes" ]; then
27     echo "You said << ${ANSWER} >> so I am exiting now."
28     exit 1
29@@ -833,11 +833,11 @@ case "${COMMAND}" in
30 
31     if [[ ! "${RESTORE_DEST}" ]]; then
32       echo "Please provide a destination path (eg, /home/user/dir):"
33-      read -e NEWDESTINATION
34+      read -r -e NEWDESTINATION
35       DEST=${NEWDESTINATION}
36       echo ">> You will restore from ${ROOT} to ${DEST}"
37       echo "Are you sure you want to do that ('yes' to continue)?"
38-      read ANSWER
39+      read -r ANSWER
40       if [[ "${ANSWER}" != "yes" ]]; then
41         echo "You said << ${ANSWER} >> so I am exiting now."
42         echo -e "User aborted restore process ...\n" >> "${LOGFILE}"
43@@ -863,7 +863,7 @@ case "${COMMAND}" in
44     if [[ ! "${FILE_TO_RESTORE}" ]]; then
45       echo "Which file or directory do you want to restore?"
46       echo "(give the path relative to the root of the backup eg, mail/letter.txt):"
47-      read -e FILE_TO_RESTORE
48+      read -r -e FILE_TO_RESTORE
49       echo
50     fi
51 
52@@ -877,7 +877,7 @@ case "${COMMAND}" in
53     echo -e ">> RESTORE: ${FILE_TO_RESTORE}"
54     echo -e ">> TO: ${DEST}"
55     echo -e "\nAre you sure you want to do that ('yes' to continue)?"
56-    read ANSWER
57+    read -r ANSWER
58     if [ "${ANSWER}" != "yes" ]; then
59       echo "You said << ${ANSWER} >> so I am exiting now."
60       echo -e "---------------------    END    ---------------------\n" >> "${LOGFILE}"