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

Improved code, ensure that gravity.sh passes shellcheck as a whole

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-02-06 19:09:09 +01:00
parent 644ec36e64
commit 491c828661
No known key found for this signature in database
GPG Key ID: FB60471F0575164A
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gravity.sh
View File

@ -116,14 +116,15 @@ gravity_store_in_database() {
gravity_Cleanup "error"
fi
local tmpFile=$(mktemp -p "/tmp" --suffix=".gravity")
local tmpFile
tmpFile="$(mktemp -p "/tmp" --suffix=".gravity")"
if [ "$table" == "whitelist" ] || [ "$table" == "blacklist" ] || [ "$table" == "regex" ]; then
# Apply format for white-, blacklist, and regex tables, prevent globbing
set -f
for domain in $(cat < "${source}"); do
# Apply format for white-, blacklist, and regex tables
# Read file line by line
grep -v '^ *#' < "${source}" | while IFS= read -r domain
do
echo "\"${domain}\",1,$(date --utc +'%s')," >> "${tmpFile}"
done
set +f
inputfile="${tmpFile}"
else
# No need to modify the input data for the gravity table
@ -132,7 +133,7 @@ gravity_store_in_database() {
# Store domains in gravity database table ${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 \"${inputfile}\" ${table}\n" | sqlite3 "${gravityDBfile}"; } 2>&1 )
output=$( { printf ".mode csv\n.import \"%s\" ${table}\n" "${inputfile}" | sqlite3 "${gravityDBfile}"; } 2>&1 )
status="$?"
if [[ "${status}" -ne 0 ]]; then
@ -412,10 +413,10 @@ gravity_ParseFileIntoDomains() {
# Last awk command takes non-commented lines and if they have 2 fields, take the right field (the domain) and leave
# the left (IP address), otherwise grab the single field.
< ${source} awk -F '#' '{print $1}' | \
< "${source}" awk -F '#' '{print $1}' | \
awk -F '/' '{print $1}' | \
awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${destination}
sed -nr -e 's/\.{2,}/./g' -e '/\./p' > "${destination}"
return 0
fi