Mirrors/cache-domains
2
0
Fork 0
mirror of https://github.com/uklans/cache-domains synced 2024-11-22 03:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle newlines in generation scripts

Browse source 
The generation scripts will now properly handle/ignore empty lines as this previously would cause issues with the generated Unbound output.
This commit is contained in:
Amir Zarrinkafsh 2021-01-28 10:16:44 +11:00
parent 019ec04f27
commit 8fbf55bdbe
No known key found for this signature in database
GPG key ID: ECDB8EF9E77E4EBF
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/create-dnsmasq.sh
View file

@ -64,8 +64,8 @@ while read -r entry; do
done <<< $(cat ${basedir}/$filename | sort);
# All other entries
while read -r fileentry; do
# Ignore comments and wildcards
if [[ $fileentry =~ ^(\#|\*\.) ]]; then
# Ignore comments, newlines and wildcards
if [[ $fileentry =~ ^(\#|\*\.) ]] || [[ -z $fileentry ]]; then
continue
fi
parsed=$(echo $fileentry)

8
scripts/create-unbound.sh
View file

@ -45,16 +45,18 @@ while read entry; do
destfilename=$(echo $filename | sed -e 's/txt/conf/')
outputfile=${outputdir}/${destfilename}
touch $outputfile
echo "server:" >> $outputfile
while read fileentry; do
# Ignore comments
if [[ $fileentry == \#* ]]; then
# Ignore comments and newlines
if [[ $fileentry == \#* ]] || [[ -z $fileentry ]]; then
continue
fi
parsed=$(echo $fileentry | sed -e "s/^\*\.//")
if grep -qx "$parsed" $outputfile; then
continue
fi
if [[ $(head -n 1 $outputfile) != "server:" ]]; then
echo "server:" >> $outputfile
fi
echo " local-zone: \"${parsed}\" redirect" >> $outputfile
for i in ${cacheip}; do
echo " local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile