PC-Heini/LanCache-Domains
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #160 from nightah/fix-generation-scripts-newlines

Browse Source 
Handle newlines in generation scripts
This commit is contained in:
James Kinsman 2021-01-28 09:55:22 +00:00 committed by GitHub
commit e843326fce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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); done <<< $(cat ${basedir}/$filename | sort);
# All other entries # All other entries
while read -r fileentry; do while read -r fileentry; do
# Ignore comments and wildcards # Ignore comments, newlines and wildcards
if [[ $fileentry =~ ^(\#|\*\.) ]]; then if [[ $fileentry =~ ^(\#|\*\.) ]] || [[ -z $fileentry ]]; then
continue continue
fi fi
parsed=$(echo $fileentry) 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/') destfilename=$(echo $filename | sed -e 's/txt/conf/')
outputfile=${outputdir}/${destfilename} outputfile=${outputdir}/${destfilename}
touch $outputfile touch $outputfile
echo "server:" >> $outputfile
while read fileentry; do while read fileentry; do
# Ignore comments # Ignore comments and newlines
if [[ $fileentry == \#* ]]; then if [[ $fileentry == \#* ]] || [[ -z $fileentry ]]; then
continue continue
fi fi
parsed=$(echo $fileentry | sed -e "s/^\*\.//") parsed=$(echo $fileentry | sed -e "s/^\*\.//")
if grep -qx "$parsed" $outputfile; then if grep -qx "$parsed" $outputfile; then
continue continue
fi fi
if [[ $(head -n 1 $outputfile) != "server:" ]]; then
echo "server:" >> $outputfile
fi
echo " local-zone: \"${parsed}\" redirect" >> $outputfile echo " local-zone: \"${parsed}\" redirect" >> $outputfile
for i in ${cacheip}; do for i in ${cacheip}; do
echo " local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile echo " local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile