gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Strip carriage returns on matter so that whitelists work correctly. Lines that had \r would not match.

Browse Source
This commit is contained in:
rmceoin
2015-06-22 13:03:15 -07:00
parent e9324f8316
commit 66bb0e7bb3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gravity.sh
View File

@@ -77,7 +77,7 @@ done
# Find all files with the .domains extension and compile them into one file # Find all files with the .domains extension and compile them into one file
echo "** Aggregating list of domains..." echo "** Aggregating list of domains..."
find $origin/ -type f -name "*.$justDomainsExtension" -exec cat {} \; > $origin/$matter find $origin/ -type f -name "*.$justDomainsExtension" -exec cat {} \; | tr -d '\r' > $origin/$matter
# Append blacklist entries if they exist # Append blacklist entries if they exist
if [[ -f $blacklist ]];then if [[ -f $blacklist ]];then