From 0fb31462d2d93c5c30c61602ede6f246ba90dfb4 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 22 Mar 2020 19:11:32 +0800 Subject: [PATCH] luci-app-adbyby-plus: sync with upstream source --- package/lean/luci-app-adbyby-plus/Makefile | 2 +- .../luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index c3710b55ff..98b2bd283f 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:=67 +PKG_RELEASE:=68 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh index ca4c56ffac..2f1153fef1 100755 --- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh +++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh @@ -43,6 +43,7 @@ if [ ! -f "/tmp/adbyby.updated" ];then rm -f /tmp/adbyby/data/*.bak - /etc/init.d/adbyby restart + kill -9 $(busybox ps -w | grep "/tmp/adbyby/adbyby" | grep -v grep | grep -v update | awk '{print $1}') >/dev/null 2>&1 + /tmp/adbyby/adbyby >/dev/null 2>&1 & fi