Invert logic to reduce nesting

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-05-01 21:12:22 +02:00
parent 008e88b84b
commit 0cfecd31d3
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD

View file

@ -149,8 +149,11 @@ database_table_from_file() {
# Migrate pre-v5.0 list files to database-based Pi-hole versions # Migrate pre-v5.0 list files to database-based Pi-hole versions
migrate_to_database() { migrate_to_database() {
# Create database file if not present # Create database file only if not present
if [ ! -e "${gravityDBfile}" ]; then if [ -e "${gravityDBfile}" ]; then
return 0
fi
echo -e " ${INFO} Creating new gravity database" echo -e " ${INFO} Creating new gravity database"
generate_gravity_database generate_gravity_database
@ -175,7 +178,6 @@ migrate_to_database() {
echo -e " ${INFO} Migrating content of ${regexFile} into new database" echo -e " ${INFO} Migrating content of ${regexFile} into new database"
database_table_from_file "regex" "${regexFile}" database_table_from_file "regex" "${regexFile}"
fi fi
fi
} }
# Determine if DNS resolution is available before proceeding # Determine if DNS resolution is available before proceeding