From bcbe4750d48f5bbd8588b0f0c16d496d0b80a35f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 19 Apr 2019 11:18:34 +0800 Subject: [PATCH] luci app frpc: ajust order --- package/lean/luci-app-frpc/Makefile | 2 +- package/lean/luci-app-frpc/luasrc/controller/frp.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-frpc/Makefile b/package/lean/luci-app-frpc/Makefile index 9d6ce7484..911ad624d 100644 --- a/package/lean/luci-app-frpc/Makefile +++ b/package/lean/luci-app-frpc/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=LuCI for FRPC LUCI_DEPENDS:=+wget +frpc LUCI_PKGARCH:=all PKG_VERSION:=1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-frpc/luasrc/controller/frp.lua b/package/lean/luci-app-frpc/luasrc/controller/frp.lua index a6d2ff561..41df2c8cb 100644 --- a/package/lean/luci-app-frpc/luasrc/controller/frp.lua +++ b/package/lean/luci-app-frpc/luasrc/controller/frp.lua @@ -5,10 +5,11 @@ function index() return end - entry({"admin","services","frp"},cbi("frp/frp"), _("Frp Setting"),5).dependent=true + entry({"admin","services","frp"},cbi("frp/frp"), _("Frp Setting"),100).dependent=true entry({"admin","services","frp","config"},cbi("frp/config")).leaf=true entry({"admin","services","frp","status"},call("status")).leaf=true end + function status() local e={} e.running=luci.sys.call("pidof frpc > /dev/null")==0