bcd64c10d2b65ac12beecfc3e006c30946d5817a
- Author
- zertrin <zertrin@gmail.com>
- Committer
- zertrin <zertrin@gmail.com>
- Date
Message
first iteration after activation of Travis-CI
Diff
1diff --git a/.travis.yml b/.travis.yml
2index 60ea2db7aba04f560eb63217c0a032a912dd530e..875f889ccbe0dea300c8a7efec0f00e750169a23 100644
3--- a/.travis.yml
4+++ b/.travis.yml
5@@ -11,7 +11,7 @@ addons:
6 - shellcheck
7
8 script:
9- - shellcheck duplicity-backup.sh
10+ - shellcheck -e SC2153 duplicity-backup.sh
11 - shellcheck -e SC2034 duplicity-backup.conf.example
12
13 matrix:
14diff --git a/duplicity-backup.sh b/duplicity-backup.sh
15index a194837dba6e914ee1157582bc19f00827931fc7..cc28ebbdd6ee31c2241bb80dc0e2ff851418f163 100755
16--- a/duplicity-backup.sh
17+++ b/duplicity-backup.sh
18@@ -432,7 +432,7 @@ get_source_file_size()
19
20 for include in "${DUINCLIST[@]}"; do
21 echo -e "${DUEXCLIST}" | \
22- du -hs ${DUEXCFLAG} ${include} | \
23+ du -hs ${DUEXCFLAG} "${include}" | \
24 awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
25 >> "${LOGFILE}"
26 done
27@@ -683,7 +683,8 @@ backup_this_script()
28 fi
29
30 if [ ! -z "${GPG_ENC_KEY}" -a ! -z "${GPG_SIGN_KEY}" ]; then
31- export GPG_TTY=$(tty)
32+ GPG_TTY=$(tty)
33+ export GPG_TTY
34 if [ "${GPG_ENC_KEY}" = "${GPG_SIGN_KEY}" ]; then
35 gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt
36 else