arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Improve error reporting

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-04-25 10:18:37 +02:00
parent c1277705d8
commit 2664ac0efc
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gravity.sh
View File

@ -143,7 +143,12 @@ database_table_from_file() {
fi fi
# Delete tmpfile # Delete tmpfile
rm "$tmpFile" > /dev/null 2>&1 || true rm "${tmpFile}" > /dev/null 2>&1 || \
echo -e " ${CROSS} Unable to remove ${tmpFile}"
# Delete source file
rm "${source}" 2> /dev/null || \
echo -e " ${CROSS} Unable to remove ${source}"
} }
migrate_to_database() { migrate_to_database() {
@ -152,22 +157,18 @@ ls -lh
if [[ -e "${whitelistFile}" ]]; then if [[ -e "${whitelistFile}" ]]; then
# Store whitelisted domains in database # Store whitelisted domains in database
database_table_from_file "whitelist" "${whitelistFile}" database_table_from_file "whitelist" "${whitelistFile}"
rm "${whitelistFile}"
fi fi
if [[ -e "${blacklistFile}" ]]; then if [[ -e "${blacklistFile}" ]]; then
# Store blacklisted domains in database # Store blacklisted domains in database
database_table_from_file "blacklist" "${blacklistFile}" database_table_from_file "blacklist" "${blacklistFile}"
rm "${blacklistFile}"
fi fi
if [[ -e "${regexFile}" ]]; then if [[ -e "${regexFile}" ]]; then
# Store regex domains in database # Store regex domains in database
database_table_from_file "regex" "${regexFile}" database_table_from_file "regex" "${regexFile}"
rm "${regexFile}"
fi fi
if [[ -e "${adListFile}" ]]; then if [[ -e "${adListFile}" ]]; then
# Store adlists domains in database # Store adlists domains in database
database_table_from_file "adlists" "${adListFile}" database_table_from_file "adlists" "${adListFile}"
rm "${adListFile}"
fi fi
} }