mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-12-24 20:35:28 +00:00
Ignore commented lines when reding PRIVACYLEVEL from config file
Create dedicated getVal function in utils.sh as it might be useful somewhere else Account for tailing comments and $key not being on the first line Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
@@ -44,7 +44,7 @@ addOrEditKeyValPair() {
|
||||
}
|
||||
|
||||
#######################
|
||||
# Takes two arguments: file, and key.
|
||||
# Takes two arguments: file and key.
|
||||
# Adds a key to target file
|
||||
#
|
||||
# Example usage:
|
||||
@@ -64,7 +64,7 @@ addKey(){
|
||||
}
|
||||
|
||||
#######################
|
||||
# Takes two arguments: file, and key.
|
||||
# Takes two arguments: file and key.
|
||||
# Deletes a key or key/value pair from target file
|
||||
#
|
||||
# Example usage:
|
||||
@@ -76,6 +76,24 @@ removeKey() {
|
||||
sed -i "/^${key}/d" "${file}"
|
||||
}
|
||||
|
||||
#######################
|
||||
# Takes two arguments: file and key.
|
||||
# Returns the value of a given key from target file
|
||||
# - ignores all commented lines
|
||||
# - only returns the first value if multiple identical keys exist
|
||||
#
|
||||
#
|
||||
# Example usage:
|
||||
# getVal "/etc/pihole/setupVars.conf" "PIHOLE_DNS_1"
|
||||
#######################
|
||||
getVal() {
|
||||
local file="${1}"
|
||||
local key="${2}"
|
||||
local value
|
||||
value=$(sed -e '/^[[:blank:]]*#/d' "${file}" | grep "${key}" | awk -F "=" 'NR==1{printf$2}')
|
||||
printf "%s" "$value"
|
||||
}
|
||||
|
||||
|
||||
#######################
|
||||
# returns FTL's current telnet API port based on the setting in /etc/pihole-FTL.conf
|
||||
|
||||
Reference in New Issue
Block a user