dup (helper + handler + example config) : don't pretend anymore that duplicity

[matthijs/upstream/backupninja.git] / handlers / dup

diff --git a/handlers/dup b/handlers/dup
index 227ba8bcf11f1edc90b0dd71d696ef6ea46ee52d..7c8a7c6383c78c207a547d323d14fc0160a3e49e 100644 (file)
--- a/handlers/dup
+++ b/handlers/dup
@@ -51,7 +51,6 @@ if [ $vservers_are_available = yes ]; then
    fi
 else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
-   [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'   
 fi
 
 ### see if we can login ###
@@ -80,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
 
@@ -90,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"
@@ -118,15 +117,15 @@ set -o noglob
 
 # excludes
 for i in $exclude; do
-       i=`readlink -f $i`
        str="${i//__star__/*}"
+       i=`readlink -f ${i#}`
        execstr="${execstr}--exclude '$str' "
 done
        
 # includes 
 for i in $include; do
-       i=`readlink -f $i`
        str="${i//__star__/*}"
+       i=`readlink -f ${i#}`
        execstr="${execstr}--include '$str' "
 done