From d2ae7c58c1d5c1a8e2d2b24efa0c3a0807dae3ad Mon Sep 17 00:00:00 2001 From: zertrin Date: Sun, 11 Sep 2016 22:58:25 +0200 Subject: [PATCH] Fix GPG error when backing up the script if no specific keyring is set up --- CHANGELOG | 1 + duplicity-backup.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index eae791a..11da559 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ vX.X (XXXX-XX-XX) ================= + * Fix GPG error when backing up the script if no specific keyring is set up. * placeholder for next version's changelog v1.2 (2016-09-10) diff --git a/duplicity-backup.sh b/duplicity-backup.sh index 562ba9c..d6c780d 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -833,10 +833,13 @@ backup_this_script() GPG_TTY=$(tty) export GPG_TTY 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 + # shellcheck disable=SC2086 + gpg -a --export-secret-keys ${KEYRING} ${GPG_ENC_KEY} > "${TMPDIR}"/duplicity-backup-encryption-and-sign-secret.key.txt else - gpg -a --export-secret-keys "${KEYRING}" "${GPG_ENC_KEY}" > "${TMPDIR}"/duplicity-backup-encryption-secret.key.txt - gpg -a --export-secret-keys "${KEYRING}" "${GPG_SIGN_KEY}" > "${TMPDIR}"/duplicity-backup-sign-secret.key.txt + # shellcheck disable=SC2086 + gpg -a --export-secret-keys ${KEYRING} ${GPG_ENC_KEY} > "${TMPDIR}"/duplicity-backup-encryption-secret.key.txt + # shellcheck disable=SC2086 + gpg -a --export-secret-keys ${KEYRING} ${GPG_SIGN_KEY} > "${TMPDIR}"/duplicity-backup-sign-secret.key.txt fi fi