Fixed INCLIST
This commit is contained in:
parent
02015c89d5
commit
0275cb5668
1 changed files with 11 additions and 6 deletions
|
|
@ -226,7 +226,6 @@ check_variables ()
|
||||||
{
|
{
|
||||||
[[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured"
|
[[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured"
|
||||||
[[ ${DEST} = "" ]] && config_sanity_fail "DEST must be configured"
|
[[ ${DEST} = "" ]] && config_sanity_fail "DEST must be configured"
|
||||||
[[ ${INCLIST} = "" ]] && config_sanity_fail "INCLIST must have some value(s) specified"
|
|
||||||
[[ ( ${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")) ]] && \
|
||||||
|
|
@ -381,7 +380,12 @@ include_exclude()
|
||||||
EXCLUDE=$EXCLUDE$TMP
|
EXCLUDE=$EXCLUDE$TMP
|
||||||
done
|
done
|
||||||
|
|
||||||
EXCLUDEROOT="--exclude=**"
|
# INCLIST is empty so every file needs to be saved
|
||||||
|
if [[ "$INCLIST" == '' ]]; then
|
||||||
|
EXCLUDEROOT=''
|
||||||
|
else
|
||||||
|
EXCLUDEROOT="--exclude=**"
|
||||||
|
fi
|
||||||
|
|
||||||
# Restore IFS
|
# Restore IFS
|
||||||
IFS=$OLDIFS
|
IFS=$OLDIFS
|
||||||
|
|
@ -508,6 +512,10 @@ echo -e "-------- START DUPLICITY-BACKUP SCRIPT --------\n" >> ${LOGFILE}
|
||||||
|
|
||||||
get_lock
|
get_lock
|
||||||
|
|
||||||
|
INCLUDE=
|
||||||
|
EXCLUDE=
|
||||||
|
EXLUDEROOT=
|
||||||
|
|
||||||
case "$COMMAND" in
|
case "$COMMAND" in
|
||||||
"backup-script")
|
"backup-script")
|
||||||
backup_this_script
|
backup_this_script
|
||||||
|
|
@ -573,9 +581,6 @@ case "$COMMAND" in
|
||||||
|
|
||||||
"restore-file")
|
"restore-file")
|
||||||
ROOT=$DEST
|
ROOT=$DEST
|
||||||
INCLUDE=
|
|
||||||
EXCLUDE=
|
|
||||||
EXLUDEROOT=
|
|
||||||
OPTION=
|
OPTION=
|
||||||
|
|
||||||
if [ ! -z "$TIME" ]; then
|
if [ ! -z "$TIME" ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue