first iteration after activation of Travis-CI

This commit is contained in:
zertrin 2016-03-25 20:40:46 +01:00
parent 93e9854b98
commit bcd64c10d2
2 changed files with 4 additions and 3 deletions

View file

@ -11,7 +11,7 @@ addons:
- shellcheck - shellcheck
script: script:
- shellcheck duplicity-backup.sh - shellcheck -e SC2153 duplicity-backup.sh
- shellcheck -e SC2034 duplicity-backup.conf.example - shellcheck -e SC2034 duplicity-backup.conf.example
matrix: matrix:

View file

@ -432,7 +432,7 @@ get_source_file_size()
for include in "${DUINCLIST[@]}"; do for include in "${DUINCLIST[@]}"; do
echo -e "${DUEXCLIST}" | \ echo -e "${DUEXCLIST}" | \
du -hs ${DUEXCFLAG} ${include} | \ du -hs ${DUEXCFLAG} "${include}" | \
awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \ awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
>> "${LOGFILE}" >> "${LOGFILE}"
done done
@ -683,7 +683,8 @@ backup_this_script()
fi fi
if [ ! -z "${GPG_ENC_KEY}" -a ! -z "${GPG_SIGN_KEY}" ]; then if [ ! -z "${GPG_ENC_KEY}" -a ! -z "${GPG_SIGN_KEY}" ]; then
export GPG_TTY=$(tty) GPG_TTY=$(tty)
export GPG_TTY
if [ "${GPG_ENC_KEY}" = "${GPG_SIGN_KEY}" ]; then if [ "${GPG_ENC_KEY}" = "${GPG_SIGN_KEY}" ]; then
gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt
else else