Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-25 00:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Review comments and fixing stickler complaints.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-07-06 09:32:41 +02:00
parent 2fb4256f84
commit 0405aaa3da
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
5 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gravity.sh
View file

@ -115,25 +115,28 @@ database_table_from_file() {
inputfile="${source}"
else
# Apply format for white-, blacklist, regex, and adlist tables
local rowid
declare -i rowid
rowid=1
# Read file line by line
if [[ "${table}" == "auditlist" ]]; then
local rowid
declare -i rowid
rowid=1
grep -v '^ *#' < "${source}" | while IFS= read -r domain
do
# Only add non-empty lines
if [[ ! -z "${domain}" ]]; then
if [[ -n "${domain}" ]]; then
# Auditlist table format
echo "${rowid},\"${domain}\",${timestamp}" >> "${tmpFile}"
rowid+=1
fi
done
else
local rowid
declare -i rowid
rowid=1
grep -v '^ *#' < "${source}" | while IFS= read -r domain
do
# Only add non-empty lines
if [[ ! -z "${domain}" ]]; then
if [[ -n "${domain}" ]]; then
# White-, black-, and regexlist format
echo "${rowid},\"${domain}\",1,${timestamp},${timestamp},\"Migrated from ${source}\"" >> "${tmpFile}"
rowid+=1
@ -198,7 +201,7 @@ migrate_to_database() {
if [ -e "${auditFile}" ]; then
# Store audit domains in database
echo -e " ${INFO} Migrating content of ${auditFile} into new database"
database_table_from_file "auditlist" "${auditFile}"
database_table_from_file "domain_auditlist" "${auditFile}"
fi
}