arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-18 12:00:55 +00:00
Code Issues Releases Wiki Activity

Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too)

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-04-26 20:54:01 +02:00
parent 3fe43ce1d9
commit b4ae142149
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
advanced/Scripts/list.sh
View File

@ -118,11 +118,11 @@ ProcessDomainList() {
AddDomain() { AddDomain() {
local domain list num local domain list num
# Use printf to escape domain. %q prints the argument in a form that can be reused as shell input # Use printf to escape domain. %q prints the argument in a form that can be reused as shell input
domain="$(printf "%q" "$1")" domain="$1"
list="$2" list="$2"
# Is the domain in the list we want to add it to? # Is the domain in the list we want to add it to?
num="$(sqlite3 "${gravityDBfile}" "SELECT COUNT(*) FROM ${list} WHERE domain = \"${domain}\";")" num="$(sqlite3 "${gravityDBfile}" "SELECT COUNT(*) FROM ${list} WHERE domain = '${domain}';")"
if [[ "${num}" -ne 0 ]]; then if [[ "${num}" -ne 0 ]]; then
if [[ "${verbose}" == true ]]; then if [[ "${verbose}" == true ]]; then
@ -138,17 +138,17 @@ AddDomain() {
reload=true reload=true
# Insert only the domain here. The enabled and date_added fields will be filled # Insert only the domain here. The enabled and date_added fields will be filled
# with their default values (enabled = true, date_added = current timestamp) # with their default values (enabled = true, date_added = current timestamp)
sqlite3 "${gravityDBfile}" "INSERT INTO ${list} (domain) VALUES (\"${domain}\");" sqlite3 "${gravityDBfile}" "INSERT INTO ${list} (domain) VALUES ('${domain}');"
} }
RemoveDomain() { RemoveDomain() {
local domain list num local domain list num
# Use printf to escape domain. %q prints the argument in a form that can be reused as shell input # Use printf to escape domain. %q prints the argument in a form that can be reused as shell input
domain="$(printf "%q" "$1")" domain="$1"
list="$2" list="$2"
# Is the domain in the list we want to remove it from? # Is the domain in the list we want to remove it from?
num="$(sqlite3 "${gravityDBfile}" "SELECT COUNT(*) FROM ${list} WHERE domain = \"${domain}\";")" num="$(sqlite3 "${gravityDBfile}" "SELECT COUNT(*) FROM ${list} WHERE domain = '${domain}';")"
if [[ "${num}" -eq 0 ]]; then if [[ "${num}" -eq 0 ]]; then
if [[ "${verbose}" == true ]]; then if [[ "${verbose}" == true ]]; then
@ -163,7 +163,7 @@ RemoveDomain() {
fi fi
reload=true reload=true
# Remove it from the current list # Remove it from the current list
sqlite3 "${gravityDBfile}" "DELETE FROM ${list} WHERE domain = \"${domain}\";" sqlite3 "${gravityDBfile}" "DELETE FROM ${list} WHERE domain = '${domain}';"
} }
Displaylist() { Displaylist() {