From d8de5f0bddc26a357fb0184338b8c3a800bffc3a Mon Sep 17 00:00:00 2001 From: Zertrin Date: Fri, 14 Sep 2012 17:00:34 +0200 Subject: [PATCH] Changes to "check_variables()" to prevent errors if no encryption is desired (by Rolando Daniel Arnaudo) --- duplicity-backup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/duplicity-backup.sh b/duplicity-backup.sh index 6fde6aa..c3fc583 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -198,9 +198,9 @@ fi check_variables () { if [[ ${ROOT} = "" || ${DEST} = "" || ${INCLIST} = "" || \ - ${GPG_ENC_KEY} = "foobar_gpg_key" || \ + ( ${ENCRYPTION} = "yes" && (${GPG_ENC_KEY} = "foobar_gpg_key" || \ ${GPG_SIGN_KEY} = "foobar_gpg_key" || \ - ${PASSPHRASE} = "foobar_gpg_passphrase" || \ + ${PASSPHRASE} = "foobar_gpg_passphrase")) || \ ${LOGDIR} = "/home/foobar_user_name/logs/test2/" || \ ( ${DEST_IS_S3} = true && ${AWS_ACCESS_KEY_ID} = "foobar_aws_key_id" ) || \ ( ${DEST_IS_S3} = true && ${AWS_SECRET_ACCESS_KEY} = "foobar_aws_access_key" ) ]]; then