moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-11-26 11:02:19 -05:00
Code Issues Releases Wiki Activity

Merge pull request #21 from rmceoin/master

Browse Source 
Strip carriage returns on matter so that whitelists work correctly.
This commit is contained in:
Jacob Salmela 2015-06-22 16:45:30 -05:00
commit a908dfdd28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gravity.sh
View File

@ -77,13 +77,13 @@ 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
numberOf=$(cat $blacklist | wc -l | sed 's/^[ \t]*//') numberOf=$(cat $blacklist | wc -l | sed 's/^[ \t]*//')
echo "** Blacklisting $numberOf domain(s)..." echo "** Blacklisting $numberOf domain(s)..."
cat $blacklist >> /tmp/matter.txt cat $blacklist >> $origin/$matter
else else
: :
fi fi