2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
zertrin 2015-04-21 00:10:46 +02:00
commit e976b5def9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
duplicity-backup.sh
View file

@ -212,7 +212,7 @@ elif [ "$ENCRYPTION" = "no" ]; then
ENCRYPT="--no-encryption" ENCRYPT="--no-encryption"
fi fi
NO_S3CMD="WARNING: s3cmd no found in PATH, remote file \ NO_S3CMD="WARNING: s3cmd not found in PATH, remote file \
size information unavailable." size information unavailable."
NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \ NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \
in order to retrieve remote file size information. Remote file \ in order to retrieve remote file size information. Remote file \
@ -237,7 +237,7 @@ if [ "`echo ${DEST} | cut -c 1,2`" = "s3" ]; then
echo "${S3CMD_CONF_FILE} not found, check S3CMD_CONF_FILE variable in duplicity-backup's configuration!"; echo "${S3CMD_CONF_FILE} not found, check S3CMD_CONF_FILE variable in duplicity-backup's configuration!";
echo $NO_S3CMD_CFG; echo $NO_S3CMD_CFG;
S3CMD_AVAIL=false S3CMD_AVAIL=false
else else
S3CMD_AVAIL=true S3CMD_AVAIL=true
S3CMD_CONF_FOUND=true S3CMD_CONF_FOUND=true
if [ ! -z "$S3CMD_CONF_FILE" -a -f "$S3CMD_CONF_FILE" ]; then if [ ! -z "$S3CMD_CONF_FILE" -a -f "$S3CMD_CONF_FILE" ]; then
@ -453,7 +453,7 @@ include_exclude()
# Exlcude device files? # Exlcude device files?
if [ ! -z $EXDEVICEFILES ] && [ $EXDEVICEFILES -ne 0 ]; then if [ ! -z $EXDEVICEFILES ] && [ $EXDEVICEFILES -ne 0 ]; then
TMP=" --exclude-device-files" TMP=" --exclude-device-files"
INCLUDE=$INCLUDE$TMP EXCLUDE=$EXCLUDE$TMP
fi fi
for include in ${INCLIST[@]} for include in ${INCLIST[@]}