From da2e01edfa1b8e374f302653308fdfdc215cc759 Mon Sep 17 00:00:00 2001
From: Tianhe Y <10704839+nftbty@users.noreply.github.com>
Date: Thu, 7 Mar 2024 01:02:53 +0800
Subject: [PATCH] luci: continue to fix #2992
---
luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua | 4 ++--
.../luasrc/model/cbi/passwall/client/shunt_rules.lua | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
index ce1f214a4..bd147ccef 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
@@ -1,7 +1,7 @@
local api = require "luci.passwall.api"
local appname = api.appname
local has_xray = api.finded_com("xray")
-local has_singbox = api.finded_com("sing-box")
+local has_singbox = api.finded_com("singbox")
m = Map(appname)
-- [[ Rule Settings ]]--
@@ -66,7 +66,7 @@ if has_xray or has_singbox then
o.default = "/usr/share/v2ray/"
o.rmempty = false
- s = m:section(TypedSection, "shunt_rules", "Xray/Sing-Box " .. translate("Shunt Rule"), "" .. translate("Please note attention to the priority, the higher the order, the higher the priority.") .. "")
+ s = m:section(TypedSection, "shunt_rules", "Sing-Box/Xray " .. translate("Shunt Rule"), "" .. translate("Please note attention to the priority, the higher the order, the higher the priority.") .. "")
s.template = "cbi/tblsection"
s.anonymous = false
s.addremove = true
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua
index d3f4b450b..07db83147 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua
@@ -2,7 +2,7 @@ local api = require "luci.passwall.api"
local appname = api.appname
local datatypes = api.datatypes
-m = Map(appname, "Xray " .. translate("Shunt Rule"))
+m = Map(appname, "Sing-Box/Xray " .. translate("Shunt Rule"))
m.redirect = api.url()
s = m:section(NamedSection, arg[1], "shunt_rules", "")