diff --git a/package/cnsztl/luci-app-unblockneteasemusic/Makefile b/package/cnsztl/luci-app-unblockneteasemusic/Makefile index facd5d8edb..07947ae13a 100644 --- a/package/cnsztl/luci-app-unblockneteasemusic/Makefile +++ b/package/cnsztl/luci-app-unblockneteasemusic/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for UnblockNeteaseMusic-nondanee -LUCI_DEPENDS:=+UnblockNeteaseMusic-nondanee +bash +dnsmasq-full +ipset +LUCI_DEPENDS:=+UnblockNeteaseMusic-nondanee +bash +dnsmasq-full +ipset +coreutils-nohup LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic -PKG_VERSION:=1.5 -PKG_RELEASE:=2 +PKG_VERSION:=1.6 +PKG_RELEASE:=1 PKG_MAINTAINER:= diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index db09539fbe..e75d755443 100755 --- a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -97,11 +97,11 @@ start() [ "${enable}" -eq "0" ] && exit 0 if [ "${type}" = "default" ]; then - node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & + nohup node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & elif [ "${type}" = "all" ]; then - node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} -o kuwo migu xiami kugou qq joox netease ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & + nohup node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} -o kuwo migu xiami kugou qq joox netease ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & else - node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} -o ${type} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & + nohup node /usr/share/unblockneteasemusic/app.js -a ${addr} -p ${http_port}:${https_port} -o ${type} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockneteasemusic.log 2>&1 & fi if [ "*${hijack_ways}*" = "*use_ipset*" ]; then @@ -112,13 +112,13 @@ start() set_hosts fi - /usr/share/unblockneteasemusic/logcheck.sh >/dev/null 2>&1 & + nohup /usr/share/unblockneteasemusic/logcheck.sh >/dev/null 2>&1 & } stop() { - kill -9 "$(ps |grep unblockneteasemusic |grep app.js |grep -v grep |awk '{print $1}')" >/dev/null 2>&1 - kill -9 "$(ps |grep unblockneteasemusic |grep logcheck.sh |grep -v grep |awk '{print $1}')" >/dev/null 2>&1 + { ps |grep "unblockneteasemusic" |grep "app.js" |grep -v "grep" |awk '{print $1}' |xargs kill -9; } >/dev/null 2>&1 + { ps |grep "unblockneteasemusic" |grep "logcheck.sh" |grep -v "grep" |awk '{print $1}' |xargs kill -9; } >/dev/null 2>&1 rm -f /tmp/unblockneteasemusic.log