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-26 01:00:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' into new/gravity.db_domain_groups

Browse source
This commit is contained in:
DL6ER 2019-07-03 19:21:55 +02:00
commit 7a1b6fd205
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
6 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gravity.sh
View file

@ -129,7 +129,7 @@ database_table_from_file() {
# Store domains in database table specified by ${table}
# Use printf as .mode and .import need to be on separate lines
# see https://unix.stackexchange.com/a/445615/83260
output=$( { printf ".mode csv\\n.import \"%s\" %s\\n" "${inputfile}" "${table}" | sqlite3 "${gravityDBfile}"; } 2>&1 )
output=$( { printf ".timeout 10000\\n.mode csv\\n.import \"%s\" %s\\n" "${inputfile}" "${table}" | sqlite3 "${gravityDBfile}"; } 2>&1 )
status="$?"
if [[ "${status}" -ne 0 ]]; then