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

Delete trailing spaces

Browse source
This commit is contained in:
zertrin 2015-05-18 18:40:23 +02:00
parent 4be3671511
commit a69eeaad85
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
AUTHORS
View file

@ -1,4 +1,5 @@
Damon Timm <damontimm@gmail.com> <http://blog.damontimm.com> Damon Timm <damontimm@gmail.com> <http://blog.damontimm.com>
Mario Santagiuliana <mario@marionline.it> <http://www.marionline.it> Mario Santagiuliana <mario@marionline.it> <http://www.marionline.it>
Razvan Marescu <rmarescu+github@gmail.com> <http://github.com/rmarescu> Razvan Marescu <rmarescu+github@gmail.com> <https://github.com/rmarescu>
Marc Gallet <gmarc34@gmail.com> <http://github.com/zertrin> Marc Gallet <zertrin@gmail.com> <https://github.com/zertrin>
All commit contributors https://github.com/zertrin/duplicity-backup/graphs/contributors

18
duplicity-backup.sh
View file

@ -283,8 +283,8 @@ check_variables ()
{ {
[[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured" [[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured"
[[ ${DEST} = "" || ${DEST} = "s3+http://backup-foobar-bucket/backup-folder/" ]] && config_sanity_fail "DEST must be configured" [[ ${DEST} = "" || ${DEST} = "s3+http://backup-foobar-bucket/backup-folder/" ]] && config_sanity_fail "DEST must be configured"
[[ ${INCLIST} = "/home/foobar_user_name/Documents/" ]] && config_sanity_fail "INCLIST must be configured" [[ ${INCLIST} = "/home/foobar_user_name/Documents/" ]] && config_sanity_fail "INCLIST must be configured"
[[ ${EXCLIST} = "/home/foobar_user_name/Documents/foobar-to-exclude" ]] && config_sanity_fail "EXCLIST must be configured" [[ ${EXCLIST} = "/home/foobar_user_name/Documents/foobar-to-exclude" ]] && config_sanity_fail "EXCLIST must be configured"
[[ ( ${ENCRYPTION} = "yes" && (${GPG_ENC_KEY} = "foobar_gpg_key" || \ [[ ( ${ENCRYPTION} = "yes" && (${GPG_ENC_KEY} = "foobar_gpg_key" || \
${GPG_SIGN_KEY} = "foobar_gpg_key" || \ ${GPG_SIGN_KEY} = "foobar_gpg_key" || \
${PASSPHRASE} = "foobar_gpg_passphrase")) ]] && \ ${PASSPHRASE} = "foobar_gpg_passphrase")) ]] && \
@ -412,7 +412,7 @@ get_source_file_size()
awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \ awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
>> ${LOGFILE} >> ${LOGFILE}
done done
echo >> ${LOGFILE} echo >> ${LOGFILE}
# Restore IFS # Restore IFS
@ -492,7 +492,7 @@ include_exclude()
TMP=" --exclude-device-files" TMP=" --exclude-device-files"
EXCLUDE=$EXCLUDE$TMP EXCLUDE=$EXCLUDE$TMP
fi fi
for include in ${INCLIST[@]} for include in ${INCLIST[@]}
do do
TMP=" --include=""'"$include"'" TMP=" --include=""'"$include"'"
@ -504,21 +504,21 @@ include_exclude()
TMP=" --exclude ""'"$exclude"'" TMP=" --exclude ""'"$exclude"'"
EXCLUDE=$EXCLUDE$TMP EXCLUDE=$EXCLUDE$TMP
done done
# Include/Exclude globbing filelist # Include/Exclude globbing filelist
if [ "$INCEXCFILE" != '' ]; then if [ "$INCEXCFILE" != '' ]; then
TMP=" --include-globbing-filelist ""'"$INCEXCFILE"'" TMP=" --include-globbing-filelist ""'"$INCEXCFILE"'"
INCLUDE=$INCLUDE$TMP INCLUDE=$INCLUDE$TMP
fi fi
# INCLIST and globbing filelist is empty so every file needs to be saved # INCLIST and globbing filelist is empty so every file needs to be saved
if [ "$INCLIST" == '' ] && [ "$INCEXCFILE" == '' ]; then if [ "$INCLIST" == '' ] && [ "$INCEXCFILE" == '' ]; then
EXCLUDEROOT='' EXCLUDEROOT=''
else else
EXCLUDEROOT="--exclude=**" EXCLUDEROOT="--exclude=**"
fi fi
# Restore IFS # Restore IFS
IFS=$OLDIFS IFS=$OLDIFS
} }
@ -538,7 +538,7 @@ duplicity_cleanup()
${ENCRYPT} \ ${ENCRYPT} \
${DEST} >> ${LOGFILE} ${DEST} >> ${LOGFILE}
echo >> ${LOGFILE} echo >> ${LOGFILE}
fi fi
} }
duplicity_backup() duplicity_backup()