e976b5def91244757712d1724afab7487d033a89

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

Message

Merge branch 'move-exclude-device-files' into dev

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index ed8283175459d9f5241a7d9fe34bf62fc7398af7..45c95aaf9ec6295a447d8edfe068f9ad12aa543e 100644
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -212,7 +212,7 @@ elif [ "$ENCRYPTION" = "no" ]; then
 6   ENCRYPT="--no-encryption"
 7 fi
 8 
 9-NO_S3CMD="WARNING: s3cmd no found in PATH, remote file \
10+NO_S3CMD="WARNING: s3cmd not found in PATH, remote file \
11 size information unavailable."
12 NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \
13 in order to retrieve remote file size information. Remote file \
14@@ -237,7 +237,7 @@ if  [ "`echo ${DEST} | cut -c 1,2`" = "s3" ]; then
15     echo "${S3CMD_CONF_FILE} not found, check S3CMD_CONF_FILE variable in duplicity-backup's configuration!";
16     echo $NO_S3CMD_CFG;
17     S3CMD_AVAIL=false
18-  else    
19+  else
20     S3CMD_AVAIL=true
21     S3CMD_CONF_FOUND=true
22     if [ ! -z "$S3CMD_CONF_FILE" -a -f "$S3CMD_CONF_FILE" ]; then
23@@ -453,7 +453,7 @@ include_exclude()
24   # Exlcude device files?
25   if [ ! -z $EXDEVICEFILES ] && [ $EXDEVICEFILES -ne 0 ]; then
26     TMP=" --exclude-device-files"
27-    INCLUDE=$INCLUDE$TMP
28+    EXCLUDE=$EXCLUDE$TMP
29   fi
30   
31   for include in ${INCLIST[@]}