Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

luci-app-adbyby-plus: keed adblock after upgrade

Browse Source
This commit is contained in:
LEAN-ESX 2020-03-12 07:48:51 -07:00
parent 8934f681b3
commit 44f55a8883
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-adbyby-plus/Makefile
View File

@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_NAME:=luci-app-adbyby-plus PKG_NAME:=luci-app-adbyby-plus
PKG_VERSION:=2.0 PKG_VERSION:=2.0
PKG_RELEASE:=63 PKG_RELEASE:=65
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

2
package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua
View File

@ -47,7 +47,7 @@ luci.sys.exec("/usr/share/adbyby/rule-update")
end end
if tonumber(icount) ~= tonumber(oldcount) then if tonumber(icount) ~= tonumber(oldcount) then
luci.sys.exec("rm -rf /usr/share/adbyby/rules/* && cp -a /tmp/rules /usr/share/adbyby/") luci.sys.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/* && cp -a /tmp/rules /usr/share/adbyby/")
luci.sys.exec("/etc/init.d/dnsmasq reload") luci.sys.exec("/etc/init.d/dnsmasq reload")
retstring=tostring(math.ceil(tonumber(icount))) retstring=tostring(math.ceil(tonumber(icount)))
else else

3
package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua
View File

@ -41,8 +41,7 @@ o.description = translate("AdGuardHome / Host / DNSMASQ rules auto-convert")
o = s:option(Button,"delete",translate("Delete All Subscribe Rules")) o = s:option(Button,"delete",translate("Delete All Subscribe Rules"))
o.inputstyle = "reset" o.inputstyle = "reset"
o.write = function() o.write = function()
SYS.exec("rm -rf /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/*") SYS.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/*")
SYS.exec("mkdir -p /usr/share/adbyby/rules/data/ /usr/share/adbyby/rules/host/")
SYS.exec("/etc/init.d/adbyby restart 2>&1 &") SYS.exec("/etc/init.d/adbyby restart 2>&1 &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adbyby", "advanced")) luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adbyby", "advanced"))
end end

2
package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby
View File

@ -106,7 +106,7 @@ add_dns()
{ {
mkdir -p /var/etc/dnsmasq-adbyby.d mkdir -p /var/etc/dnsmasq-adbyby.d
mkdir -p /tmp/dnsmasq.d mkdir -p /tmp/dnsmasq.d
mkdir -p /usr/share/adbyby/rules/host /usr/share/adbyby/rules/data
awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_esc"'\n",$0)}' $PROG_PATH/adesc.conf > /var/etc/dnsmasq-adbyby.d/06-dnsmasq.esc awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_esc"'\n",$0)}' $PROG_PATH/adesc.conf > /var/etc/dnsmasq-adbyby.d/06-dnsmasq.esc
awk '!/^$/&&!/^#/{printf("address=/%s/'"0.0.0.0"'\n",$0)}' $PROG_PATH/adblack.conf > /var/etc/dnsmasq-adbyby.d/07-dnsmasq.black awk '!/^$/&&!/^#/{printf("address=/%s/'"0.0.0.0"'\n",$0)}' $PROG_PATH/adblack.conf > /var/etc/dnsmasq-adbyby.d/07-dnsmasq.black
cat > /tmp/dnsmasq.d/dnsmasq-adbyby.conf <<EOF cat > /tmp/dnsmasq.d/dnsmasq-adbyby.conf <<EOF

3
package/lean/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby
View File

@ -2,4 +2,5 @@
/usr/share/adbyby/adblack.conf /usr/share/adbyby/adblack.conf
/usr/share/adbyby/blockip.conf /usr/share/adbyby/blockip.conf
/usr/share/adbyby/adesc.conf /usr/share/adbyby/adesc.conf
/usr/share/adbyby/rules.txt /usr/share/adbyby/rules.txt
/usr/share/adbyby/dnsmasq.adblock