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 09:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Address:

Browse source 
- Review Comments
 - Stickler Complaints
This commit is contained in:
Adam Warner 2022-03-16 20:46:15 +00:00
parent 59fc3804be
commit 7fa8cdd03e
No known key found for this signature in database
GPG key ID: 872950F3ECF2B173
4 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
advanced/Scripts/utils.sh
View file

@ -1,4 +1,6 @@
#!/usr/bin/env sh
# shellcheck disable=SC3043 #https://github.com/koalaman/shellcheck/wiki/SC3043#exceptions
# Pi-hole: A black hole for Internet advertisements
# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
# Network-wide ad blocking via your own hardware.
@ -16,28 +18,20 @@
#######################
# Takes either
# - Three arguments: key, value, and file.
# - Two arguments: key, and file
# - Three arguments: file, key, and value.
# - Two arguments: file, and key.
#
# Checks the target file for the existence of the key
# - If it exists, it changes the value
# - If it does not exist, it adds the value
#
# Example usage:
# addOrEditKeyValuePair "BLOCKING_ENABLED" "true" "/etc/pihole/setupVars.conf"
# addOrEditKeyValuePair "/etc/pihole/setupVars.conf" "BLOCKING_ENABLED" "true"
#######################
addOrEditKeyValPair() {
local key="${1}"
local value
local file
# If two arguments have been passed, then the second one is the file - there is no value
if [ $# -lt 3 ]; then
file="${2}"
else
value="${2}"
file="${3}"
fi
local file="${1}"
local key="${2}"
local value="${3}"
if [ "${value}" != "" ]; then
# value has a value, so it is a key pair

12
advanced/Scripts/webpage.sh
View file

@ -1,5 +1,7 @@
#!/usr/bin/env bash
# shellcheck disable=SC1090
# shellcheck disable=SC2154
# Pi-hole: A black hole for Internet advertisements
# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
@ -54,7 +56,7 @@ Options:
}
add_setting() {
addOrEditKeyValPair "${1}" "${2}" "${setupVars}"
addOrEditKeyValPair "${setupVars}" "${1}" "${2}"
}
delete_setting() {
@ -62,11 +64,11 @@ delete_setting() {
}
change_setting() {
addOrEditKeyValPair "${1}" "${2}" "${setupVars}"
addOrEditKeyValPair "${setupVars}" "${1}" "${2}"
}
addFTLsetting() {
addOrEditKeyValPair "${1}" "${2}" "${FTLconf}"
addOrEditKeyValPair "${FTLconf}" "${1}" "${2}"
}
deleteFTLsetting() {
@ -74,11 +76,11 @@ deleteFTLsetting() {
}
changeFTLsetting() {
addOrEditKeyValPair "${1}" "${2}" "${FTLconf}"
addOrEditKeyValPair "${FTLconf}" "${1}" "${2}"
}
add_dnsmasq_setting() {
addOrEditKeyValPair "${1}" "${2}" "${dnsmasqconfig}"
addOrEditKeyValPair "${dnsmasqconfig}" "${1}" "${2}"
}
delete_dnsmasq_setting() {