2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #141 from arichiardi/fix-gpg-photo

Browse source 
Add --no-show-photos to --gpg-options
This commit is contained in:
zertrin 2016-09-09 16:55:02 +02:00 committed by GitHub
commit 26dc5cab55
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
duplicity-backup.sh
View file

@ -332,14 +332,15 @@ fi
LOCKFILE=${LOGDIR}backup.lock LOCKFILE=${LOGDIR}backup.lock
if [ "${ENCRYPTION}" = "yes" ]; then if [ "${ENCRYPTION}" = "yes" ]; then
ENCRYPT="--gpg-options \"--no-show-photos\""
if [ ! -z "${GPG_ENC_KEY}" ] && [ ! -z "${GPG_SIGN_KEY}" ]; then if [ ! -z "${GPG_ENC_KEY}" ] && [ ! -z "${GPG_SIGN_KEY}" ]; then
if [ "${HIDE_KEY_ID}" = "yes" ]; then if [ "${HIDE_KEY_ID}" = "yes" ]; then
ENCRYPT="--hidden-encrypt-key=${GPG_ENC_KEY}" ENCRYPT="${ENCRYPT} --hidden-encrypt-key=${GPG_ENC_KEY}"
if [ "${COMMAND}" != "restore" ] && [ "${COMMAND}" != "restore-file" ] && [ "${COMMAND}" != "restore-dir" ]; then if [ "${COMMAND}" != "restore" ] && [ "${COMMAND}" != "restore-file" ] && [ "${COMMAND}" != "restore-dir" ]; then
ENCRYPT="${ENCRYPT} --sign-key=${GPG_SIGN_KEY}" ENCRYPT="${ENCRYPT} --sign-key=${GPG_SIGN_KEY}"
fi fi
else else
ENCRYPT="--encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}" ENCRYPT="${ENCRYPT} --encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}"
fi fi
if [ ! -z "${SECRET_KEYRING}" ]; then if [ ! -z "${SECRET_KEYRING}" ]; then
KEYRING="--secret-keyring ${SECRET_KEYRING}" KEYRING="--secret-keyring ${SECRET_KEYRING}"