diff --git a/update.cfg b/update.cfg.example similarity index 70% rename from update.cfg rename to update.cfg.example index fbd3bc8..522bcb2 100644 --- a/update.cfg +++ b/update.cfg.example @@ -1,10 +1,11 @@ # vi: ft=sh -WORKDIR=${WORKDIR:-${BASH_SOURCE%/*}} -BACKUPSUFFIX=.old -BLOCKLIST=$WORKDIR/block.list -LIST_DIR=$WORKDIR/lists -OUT=() -URL=() +# Defaults: +#WORKDIR=${WORKDIR:-${BASH_SOURCE%/*}} +#BACKUPSUFFIX= +#BLOCKLIST=$WORKDIR/block.list +#LIST_DIR=$WORKDIR/lists +#OUT=() +#URL=() # Individual hosts lists in that collection #OUT+=("$LIST_DIR/sb-Badd-Boyz-Hosts.hosts") diff --git a/update.sh b/update.sh index 19e531b..e1a62bf 100755 --- a/update.sh +++ b/update.sh @@ -6,7 +6,15 @@ set -e WORKDIR=${0%/*} CFG=$WORKDIR/update.cfg -. "$CFG" +# Config defaults +BACKUPSUFFIX= +BLOCKLIST=$WORKDIR/block.list +LIST_DIR=$WORKDIR/lists +OUT=() +URL=() +if [[ -f $CFG ]]; then + . "$CFG" +fi TEMP_DIR=$(mktemp -d -t "${0##*/}.XXXXXX") cleanup() {