Address stickler requests.

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-12-09 16:52:03 +00:00
parent f482156cca
commit 3231e5c3ba
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD

View file

@ -434,7 +434,7 @@ gravity_DownloadBlocklistFromUrl() {
# Determine if blocklist is non-standard and parse as appropriate # Determine if blocklist is non-standard and parse as appropriate
gravity_ParseFileIntoDomains "${patternBuffer}" "${saveLocation}" gravity_ParseFileIntoDomains "${patternBuffer}" "${saveLocation}"
# Add domains to database table # Add domains to database table
str="Adding to database table" str="Adding adlist with ID ${adlistID} to database table"
echo -ne " ${INFO} ${str}..." echo -ne " ${INFO} ${str}..."
database_table_from_file "gravity" "${saveLocation}" "${adlistID}" database_table_from_file "gravity" "${saveLocation}" "${adlistID}"
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${TICK} ${str}"
@ -677,9 +677,9 @@ if [[ "${recreate_database:-}" == true ]]; then
str="Restoring from migration backup" str="Restoring from migration backup"
echo -ne "${INFO} ${str}..." echo -ne "${INFO} ${str}..."
rm "${gravityDBfile}" rm "${gravityDBfile}"
pushd "${piholeDir}" > /dev/null pushd "${piholeDir}" > /dev/null || exit
cp migration_backup/* . cp migration_backup/* .
popd > /dev/null popd > /dev/null || exit
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${TICK} ${str}"
fi fi