Differences

This shows you the differences between two versions of the page.

--- spam [2016/01/18 11:55]
zagi [HOSTS adblocker]
+++ spam [2016/01/18 12:52]
zagi [HOSTS adblocker]
@@ Line 14: / Line 14: @@
 # Perform work in temporary files
-temphosts1="/opt/updateHF1.txt"
+temphosts1="/tmp/temphosts1.$$"
-temphosts2="/opt/updateHF2.txt"
+temphosts2="/tmp/temphosts2.$$"
-temphosts3="/opt/updateHF3.txt"
+temphosts3="/tmp/temphosts3.$$"
-temphosts4="/opt/updateHF4.txt"
+temphosts4="/tmp/temphosts4.$$"
 # Obtain various hosts files and merge into one
@@ Line 37: / Line 37: @@
 # 6. Delete any comments on lines
 # 7. Clean up leftover trailing blanks
+# 8. We whitelist hosts j.mp
+#
 # Pass all this through sort with the unique flag to remove duplicates and save the result
 echo "Parsing, cleaning, de-duplicating, sorting..."
@@ Line 44: / Line 46: @@
 #
 # IPv6 ready
-sed -e 's/\r//' -e '/^127.0.0.1\|^0.0.0.0\|^::1/!d' -e 's/\(.*\)/\L\1/' -e '/localhost/d' -e 's/127.0.0.1/::1/' -e 's/0.0.0.0/::1/' -e 's/ \+/\t/' -e 's/#.*$//' -e 's/[ \t]*$//' < $temphosts1 | sort -u > $temphosts2
+sed -e 's/\r//' -e '/^127.0.0.1\|^0.0.0.0\|^::1/!d' -e 's/\(.*\)/\L\1/' -e '/localhost/d' -e 's/127.0.0.1/::1/' -e 's/0.0.0.0/::1/' -e 's/ \+/\t/' -e 's/#.*$//' -e 's/[ \t]*$//' < $temphosts1 | sort -u | grep -v $'\tj\.mp' > $temphosts2
 # Combine system hosts with adblocks
@@ Line 62: / Line 64: @@
 # *buntu style
-#/etc/init.d/network-manager  restart
+/etc/init.d/network-manager  restart