From f9df6c9eb34e434a4285c95fa7c4e34bb3bbd6f5 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 13 Oct 2019 22:38:15 -0700 Subject: [PATCH] luci-app-unblockmusic: compatible with proc-ng-ps --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../luasrc/controller/unblockmusic.lua | 2 +- .../lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 871cf76a2..444c83402 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua index 8cc7024d8..231f0bf21 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua @@ -16,7 +16,7 @@ end function act_status() local e={} - e.running=luci.sys.call("ps | grep app.js | grep -v grep >/dev/null")==0 + e.running=luci.sys.call("busybox ps -w | grep app.js | grep -v grep >/dev/null")==0 luci.http.prepare_content("application/json") luci.http.write_json(e) end diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index d1cd4d834..f9659e1d6 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -69,9 +69,9 @@ start() stop() { - kill -9 $(ps | grep monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - kill -9 $(ps | grep app.js | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - kill -9 $(ps | grep logcheck.sh | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + kill -9 $(busybox ps -w | grep monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + kill -9 $(busybox ps -w | grep app.js | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + kill -9 $(busybox ps -w | grep logcheck.sh | grep -v grep | awk '{print $1}') >/dev/null 2>&1 rm -f /tmp/unblockmusic.log del_rule