12f9b93b12573bcfae8f2fd1bb68986b9e073655

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

Message

Adapting self-backup procedure for the case where symmetric encryption is used (no GPG keys available)

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index 403d7e681c481f8ccd15a41909b2fbd63ff04a1e..a7206c569a9e451f9d8f9462d9dc1369e6a78b9f 100755
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -382,10 +382,15 @@ backup_this_script()
 6 
 7   echo "You are backing up: "
 8   echo "      1. ${SCRIPTPATH}"
 9-  if [ "$GPG_ENC_KEY" = "$GPG_SIGN_KEY" ]; then
10-    echo "      2. GPG Secret encryption and sign key: ${GPG_ENC_KEY}"
11+
12+  if [ ! -z "$GPG_ENC_KEY" -a ! -z "$GPG_SIGN_KEY" ]; then
13+    if [ "$GPG_ENC_KEY" = "$GPG_SIGN_KEY" ]; then
14+      echo "      2. GPG Secret encryption and sign key: ${GPG_ENC_KEY}"
15+    else
16+      echo "      2. GPG Secret encryption key: ${GPG_ENC_KEY} and GPG secret sign key: ${GPG_SIGN_KEY}"
17+    fi
18   else
19-    echo "      2. GPG Secret encryption key: ${GPG_ENC_KEY} and GPG secret sign key: ${GPG_SIGN_KEY}"
20+    echo "      2. GPG Secret encryption and sign key: none (symmetric encryption)"
21   fi
22 
23   if [ ! -z "$CONFIG" -a -f "$CONFIG" ];
24@@ -410,12 +415,14 @@ backup_this_script()
25     cp $CONFIG ${TMPDIR}/
26   fi
27 
28-  export GPG_TTY=`tty`
29-  if [ "$GPG_ENC_KEY" = "$GPG_SIGN_KEY" ]; then
30-    gpg -a --export-secret-keys ${GPG_ENC_KEY} > ${TMPDIR}/duplicity-backup-encryption-and-sign-secret.key.txt
31-  else
32-    gpg -a --export-secret-keys ${GPG_ENC_KEY} > ${TMPDIR}/duplicity-backup-encryption-secret.key.txt
33-    gpg -a --export-secret-keys ${GPG_SIGN_KEY} > ${TMPDIR}/duplicity-backup-sign-secret.key.txt
34+  if [ ! -z "$GPG_ENC_KEY" -a ! -z "$GPG_SIGN_KEY" ]; then
35+    export GPG_TTY=`tty`
36+    if [ "$GPG_ENC_KEY" = "$GPG_SIGN_KEY" ]; then
37+      gpg -a --export-secret-keys ${GPG_ENC_KEY} > ${TMPDIR}/duplicity-backup-encryption-and-sign-secret.key.txt
38+    else
39+      gpg -a --export-secret-keys ${GPG_ENC_KEY} > ${TMPDIR}/duplicity-backup-encryption-secret.key.txt
40+      gpg -a --export-secret-keys ${GPG_SIGN_KEY} > ${TMPDIR}/duplicity-backup-sign-secret.key.txt
41+    fi
42   fi
43 
44   echo -e ${README_TXT} > ${README}