plugin-gargoyle-adblock: Use ewget which should always be present. Up…

…date hosts.
ericpaulbishop · Nov 11, 2019 · 7f66bc8 · 7f66bc8
1 parent 9533569
commit 7f66bc8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package/plugin-gargoyle-adblock/Makefile b/package/plugin-gargoyle-adblock/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=plugin_gargoyle_adblock
-PKG_VERSION:=20160718
-PKG_RELEASE:=1.2.0
+PKG_VERSION:=20191111
+PKG_RELEASE:=1.2.1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

diff --git a/package/plugin-gargoyle-adblock/files/usr/lib/adblock/runadblock.sh b/package/plugin-gargoyle-adblock/files/usr/lib/adblock/runadblock.sh
@@ -102,8 +102,8 @@ update_blocklist()
 
 	#Download and process the files needed to make the lists
 	logger -t ADBLOCK Retrieving ad lists from remote source
-	wget -qO- http://www.mvps.org/winhelp2002/hosts.txt| awk -v r="$ENDPOINT_IP4" '{sub(/^0.0.0.0/, r)} $0 ~ "^"r' > /tmp/block.build.list
-	wget -qO- "http://adaway.org/hosts.txt"|awk -v r="$ENDPOINT_IP4" '{sub(/^127.0.0.1/, r)} $0 ~ "^"r' >> /tmp/block.build.list
+	ewget http://winhelp2002.mvps.org/hosts.txt 2>/dev/null | awk -v r="$ENDPOINT_IP4" '{sub(/^0.0.0.0/, r)} $0 ~ "^"r' > /tmp/block.build.list
+	ewget https://adaway.org/hosts.txt 2>/dev/null |awk -v r="$ENDPOINT_IP4" '{sub(/^127.0.0.1/, r)} $0 ~ "^"r' >> /tmp/block.build.list
 
 	#Check we got a hosts file
 	if [ -s "/tmp/block.build.list" ]