d2ae7c58c1d5c1a8e2d2b24efa0c3a0807dae3ad

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

Message

Fix GPG error when backing up the script if no specific keyring is set up

Diff

 1diff --git a/CHANGELOG b/CHANGELOG
 2index eae791a67a3fd84641e889db0694893b24be70a5..11da5593adae3d0b3b548c1f3d94e54b5e5bfbb1 100644
 3--- a/CHANGELOG
 4+++ b/CHANGELOG
 5@@ -1,5 +1,6 @@
 6 vX.X (XXXX-XX-XX)
 7 =================
 8+  * Fix GPG error when backing up the script if no specific keyring is set up.
 9   * placeholder for next version's changelog
10 
11 v1.2 (2016-09-10)
12diff --git a/duplicity-backup.sh b/duplicity-backup.sh
13index 562ba9cf96cd9bbab005c8338b243e3496a7cca5..d6c780df6a005ed4f95799b6f142479e7fd4511b 100755
14--- a/duplicity-backup.sh
15+++ b/duplicity-backup.sh
16@@ -833,10 +833,13 @@ backup_this_script()
17     GPG_TTY=$(tty)
18     export GPG_TTY
19     if [ "${GPG_ENC_KEY}" = "${GPG_SIGN_KEY}" ]; then
20-      gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt
21+      # shellcheck disable=SC2086
22+      gpg -a --export-secret-keys ${KEYRING} ${GPG_ENC_KEY} > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt
23     else
24-      gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-secret.key.txt
25-      gpg -a --export-secret-keys "${KEYRING}" "${GPG_SIGN_KEY}" > "${TMPDIR}"/duplicity-backup-sign-secret.key.txt
26+      # shellcheck disable=SC2086
27+      gpg -a --export-secret-keys ${KEYRING} ${GPG_ENC_KEY} > "${TMPDIR}"/duplicity-backup-encryption-secret.key.txt
28+      # shellcheck disable=SC2086
29+      gpg -a --export-secret-keys ${KEYRING} ${GPG_SIGN_KEY} > "${TMPDIR}"/duplicity-backup-sign-secret.key.txt
30     fi
31   fi
32