26dc5cab55ba85d1cf14e3553ef0434e93415c0d
- Author
- zertrin <zrk951@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Merge pull request #141 from arichiardi/fix-gpg-photo
Add --no-show-photos to --gpg-options
Diff
1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
2index 1b4a1d54ae1e75046b424156cd624f261d0cf95a..3727c9b5b1165a91af9d0d77fb6bdec31e654505 100755
3--- a/duplicity-backup.sh
4+++ b/duplicity-backup.sh
5@@ -332,14 +332,15 @@ fi
6 LOCKFILE=${LOGDIR}backup.lock
7
8 if [ "${ENCRYPTION}" = "yes" ]; then
9+ ENCRYPT="--gpg-options \"--no-show-photos\""
10 if [ ! -z "${GPG_ENC_KEY}" ] && [ ! -z "${GPG_SIGN_KEY}" ]; then
11 if [ "${HIDE_KEY_ID}" = "yes" ]; then
12- ENCRYPT="--hidden-encrypt-key=${GPG_ENC_KEY}"
13+ ENCRYPT="${ENCRYPT} --hidden-encrypt-key=${GPG_ENC_KEY}"
14 if [ "${COMMAND}" != "restore" ] && [ "${COMMAND}" != "restore-file" ] && [ "${COMMAND}" != "restore-dir" ]; then
15 ENCRYPT="${ENCRYPT} --sign-key=${GPG_SIGN_KEY}"
16 fi
17 else
18- ENCRYPT="--encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}"
19+ ENCRYPT="${ENCRYPT} --encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}"
20 fi
21 if [ ! -z "${SECRET_KEYRING}" ]; then
22 KEYRING="--secret-keyring ${SECRET_KEYRING}"