From d81eb7ed71a660c13bd51df11a1e3a4041556e8e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 27 May 2020 11:07:24 +0800 Subject: [PATCH] luci-app-clash: fix --- package/ntlf9t/luci-app-clash/Makefile | 8 ++++---- package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile index 3f015439fb..ef60151b45 100644 --- a/package/ntlf9t/luci-app-clash/Makefile +++ b/package/ntlf9t/luci-app-clash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-clash -PKG_VERSION:=1.6.9b +PKG_VERSION:=1.6.9c PKG_MAINTAINER:=frainzy1477 @@ -100,9 +100,9 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/clash $(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/usr/share/ + $(INSTALL_DIR) $(1)/usr/share/rpcd + $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d $(INSTALL_DIR) $(1)/usr/share/clash - $(INSTALL_DIR) $(1)/usr/rpcd - $(INSTALL_DIR) $(1)/usr/rpcd/acl.d $(INSTALL_DIR) $(1)/usr/share/clash/rules $(INSTALL_DIR) $(1)/usr/share/clash/rules/g_rules $(INSTALL_DIR) $(1)/usr/share/clash/dashboard @@ -139,7 +139,7 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash/ - $(INSTALL_BIN) ./root/usr/rpcd/acl.d/luci-app-clash.json $(1)/usr/rpcd/acl.d/ + $(INSTALL_BIN) ./root/usr/share/rpcd/acl.d/luci-app-clash.json $(1)/usr/share/rpcd/acl.d/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.1560b07adc97ac0ac265.css $(1)/usr/share/clash/dashboard/ diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua index 611cd6bbda..2c2cf90f5d 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua @@ -12,8 +12,6 @@ function index() end entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) - page.dependent = true - page.acl_depends = { "luci-app-openclash" } entry({"admin", "services", "clash", "overview"},cbi("clash/overview"),_("Overview"), 10).leaf = true entry({"admin", "services", "clash", "client"},cbi("clash/client"),_("Client"), 20).leaf = true