From 44728851914120bfea626e5234a8d5521a762a07 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sun, 12 Oct 2014 11:56:43 -0500 Subject: [PATCH] added echoes Since this script takes a while to run, I added a bunch of echoes so you can see where it is in the process. --- gravity-adv.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gravity-adv.sh b/gravity-adv.sh index 507ffce1..278dd70a 100755 --- a/gravity-adv.sh +++ b/gravity-adv.sh @@ -5,6 +5,7 @@ piholeIP="192.168.1.101" eventHorizion="/etc/dnsmasq.d/adList.conf" # Download the original URL to a text file for easier parsing +echo "Getting yoyo ad list..." curl -o /tmp/yoyo.txt -s http://pgl.yoyo.org/adservers/serverlist.php?hostformat=unixhosts&mimetype=plaintext if [ -f /tmp/yoyo.txt ];then cat /tmp/yoyo.txt | grep -v "<" | sed '/^$/d' | sed 's/\ /\\ /g' | sort > /tmp/matter.txt @@ -13,21 +14,28 @@ else fi # Download and append other ad URLs from different sources +echo "Getting winhelp2002 ad list..." curl -s http://winhelp2002.mvps.org/hosts.txt | grep -v "#" | grep -v "127.0.0.1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt +echo "Getting adaway ad list..." curl -s https://adaway.org/hosts.txt | grep -v "#" | grep -v "::1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt +echo "Getting hosts-file ad list..." curl -s http://hosts-file.net/.%5Cad_servers.txt | grep -v "#" | grep -v "::1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt +echo "Getting malwaredomainlist ad list..." curl -s http://www.malwaredomainlist.com/hostslist/hosts.txt | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt +echo "Getting adblock.gjtech ad list..." curl -s http://adblock.gjtech.net/?format=unix-hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt # Sort the aggregated results and remove any duplicates +echo "Sorting and removing duplicates..." cat /tmp/matter.txt | sort | uniq | sed '/^$/d' > /tmp/andLight.txt # Read the file, prepend "address=/", and append the IP of the Raspberry Pi # This creates a correctly-formatted config file while read fermion do - boson=$(echo "$fermion" | tr -d '\r') - echo "address=/$boson/$piholeIP" >> $eventHorizion + boson=$(echo "$fermion" | tr -d '\r') + echo "address=/$boson/$piholeIP" >> $eventHorizion + echo "Added $boson..." done