diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index 0d212df29..dc615b6c7 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=62 +PKG_RELEASE:=63 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh index 06788159e..09832b556 100755 --- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh +++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh @@ -1,14 +1,8 @@ #!/bin/sh -rm -f /tmp/dnsmasq.adblock - -wget-ssl --no-check-certificate -O- https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' > /tmp/dnsmasq.adblock -if [ -s "/tmp/dnsmasq.adblock" ];then - sed -i '/youku.com/d' /tmp/dnsmasq.adblock - if ( ! cmp -s /tmp/dnsmasq.adblock /usr/share/adbyby/dnsmasq.adblock );then - mv /tmp/dnsmasq.adblock /usr/share/adbyby/dnsmasq.adblock - fi +wget-ssl --no-check-certificate -O - 'https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt' > /tmp/adnew.conf +if [ -s "/tmp/adnew.conf" ];then + /usr/share/adbyby/ad-update fi -rm -rf /tmp/adbyby.updated && /etc/init.d/adbyby restart - +rm -f /tmp/adbyby.updated && /etc/init.d/adbyby restart