diff options
| author | intrigeri <intrigeri@boum.org> | 2006-05-30 03:40:34 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2006-05-30 03:40:34 +0000 |
| commit | 098952b69d5b39ea27bbe544cd85345422d03d80 (patch) | |
| tree | 4c332248760119ce5e478b6df19f207ac9430648 /handlers/dup | |
| parent | 8439eb67f80b72f74105ac0945328a8645bc54ad (diff) | |
| download | backupninja-098952b69d5b39ea27bbe544cd85345422d03d80.tar.gz backupninja-098952b69d5b39ea27bbe544cd85345422d03d80.tar.bz2 | |
dup (helper + handler + example config) : don't pretend anymore that duplicity
can work without any passphrase ; thanks Micah for the bug report
Diffstat (limited to 'handlers/dup')
| -rw-r--r-- | handlers/dup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/handlers/dup b/handlers/dup index e490aa5..7c8a7c6 100644 --- a/handlers/dup +++ b/handlers/dup @@ -79,7 +79,6 @@ if [ -n "$encryptkey" ]; then execstr="${execstr}--encrypt-key $encryptkey " debug "Data will be encrypted with the GnuPG key $encryptkey." else - [ -n "$password" ] || fatal "The password option must be set when using symmetric encryption." debug "Data will be encrypted using symmetric encryption." fi @@ -89,14 +88,15 @@ if [ "$sign" == yes ]; then [ -n "$encryptkey" ] || fatal "The encryptkey option must be set when signing." # if needed, initialize signkey to a value that is not empty (checked above) [ -n "$signkey" ] || signkey="$encryptkey" - # check password validity - [ -n "$password" ] || fatal "The password option must be set when signing." execstr="${execstr}--sign-key $signkey " debug "Data will be signed will the GnuPG key $signkey." else debug "Data won't be signed." fi +# deal with GnuPG passphrase +[ -n "$password" ] || fatal "The password option must be set." + if [ "$keep" != "yes" ]; then if [ "`echo $keep | tr -d 0-9`" == "" ]; then keep="${keep}D" |