22099553ab420339483badb74858c3a92121881d

Author
Dan Staples <dan.staples@riseup.net>
Committer
Dan Staples <dan.staples@riseup.net>
Date

Message

dont include --sign-key when restoring w/ hidden-enc key

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index 673c55f09558a25ab16bc7d189b6ccfb597c7f89..21a6d27e66cf92d8c213de4909e418ed34b78a6c 100755
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -187,7 +187,10 @@ LOCKFILE=${LOGDIR}backup.lock
 6 if [ "$ENCRYPTION" = "yes" ]; then
 7   if [ ! -z "$GPG_ENC_KEY" ] && [ ! -z "$GPG_SIGN_KEY" ]; then
 8     if [ "$HIDE_KEY_ID" = "yes" ]; then
 9-      ENCRYPT="--hidden-encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}"
10+      ENCRYPT="--hidden-encrypt-key=${GPG_ENC_KEY}"
11+      if [ "$COMMAND" != "restore" -a "$COMMAND" != "restore-file" -a "$COMMAND" != "restore-dir" ]; then
12+        ENCRYPT="$ENCRYPT --sign-key=${GPG_SIGN_KEY}"
13+      fi
14     else
15       ENCRYPT="--encrypt-key=${GPG_ENC_KEY} --sign-key=${GPG_SIGN_KEY}"
16     fi