298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-07-06 08:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-adbyby-plus: update script to get rules

Browse Source
This commit is contained in:
lean 2020-03-17 19:40:41 +08:00
parent 377a1217cb
commit eb2dd520c0
3 changed files with 6 additions and 11 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:=66 PKG_RELEASE:=67
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

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

@ -3,7 +3,6 @@
START=98 START=98
STOP=10 STOP=10
USE_PROCD=1
EXTRA_COMMANDS="add_rule del_rule reload_rule" EXTRA_COMMANDS="add_rule del_rule reload_rule"
PROG_PATH=/usr/share/adbyby PROG_PATH=/usr/share/adbyby
@ -188,7 +187,7 @@ reload_rule()
iptables-save | grep ADBYBY >/dev/null || add_rule iptables-save | grep ADBYBY >/dev/null || add_rule
} }
start_service() start()
{ {
config_load adbyby config_load adbyby
config_foreach get_config adbyby config_foreach get_config adbyby
@ -198,12 +197,7 @@ start_service()
[ ! -d "/tmp/adbyby/data" ] && cp -a /usr/share/adbyby /tmp/ && rm -f /tmp/adbyby.updated [ ! -d "/tmp/adbyby/data" ] && cp -a /usr/share/adbyby /tmp/ && rm -f /tmp/adbyby.updated
add_rules add_rules
procd_open_instance /tmp/adbyby/adbyby >/dev/null 2>&1 &
procd_set_param command '/tmp/adbyby/adbyby'
procd_append_param command '--no-daemon'
procd_set_param respawn
procd_set_param stderr 1
procd_close_instance
add_dns add_dns
iptables-save | grep ADBYBY >/dev/null || \ iptables-save | grep ADBYBY >/dev/null || \
@ -212,8 +206,9 @@ start_service()
fi fi
} }
stop_service() stop()
{ {
kill -9 $(busybox ps -w | grep "/tmp/adbyby" | grep -v grep | awk '{print $1}') >/dev/null 2>&1
config_load adbyby config_load adbyby
config_foreach get_config adbyby config_foreach get_config adbyby
del_rule del_rule

2
package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh
View File

@ -43,6 +43,6 @@ if [ ! -f "/tmp/adbyby.updated" ];then
rm -f /tmp/adbyby/data/*.bak rm -f /tmp/adbyby/data/*.bak
kill -9 $(busybox ps -w | grep 'adbyby --no-daemon' | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /etc/init.d/adbyby restart
fi fi