Match change made by 7edab27 to prevent merge conflict

Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2018-04-13 16:53:57 +01:00
parent 82d5afe996
commit 8b5dcc3872
No known key found for this signature in database
GPG key ID: F5410858022DA5EB

View file

@ -16,12 +16,10 @@ source ${colfile}
# Constructed to return nothing when # Constructed to return nothing when
# a) the setting is not present in the config file, or # a) the setting is not present in the config file, or
# b) the setting is commented out (e.g. "#DBFILE=...") # b) the setting is commented out (e.g. "#DBFILE=...")
DBFILE="$(sed -n -e 's/^\s^.DBFILE\s*=\s*//p' /etc/pihole/pihole-FTL.conf 2> /dev/null)" FTLconf="/etc/pihole/pihole-FTL.conf"
# Test for empty string. Use standard path in this case. if [ -e "$FTLconf" ]; then
if [ -z "$DBFILE" ]; then DBFILE="$(sed -n -e 's/^\s*DBFILE\s*=\s*//p' ${FTLconf})"
DBFILE="/etc/pihole/pihole-FTL.db"
fi fi
if [[ "$@" != *"quiet"* ]]; then if [[ "$@" != *"quiet"* ]]; then
echo -ne " ${INFO} Flushing /var/log/pihole.log ..." echo -ne " ${INFO} Flushing /var/log/pihole.log ..."
fi fi