update 2023-04-23 09:28:00

ntbowen · Apr 23, 2023 · d4e4d09 · d4e4d09
1 parent 949bdf5
commit d4e4d09
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 27 deletions.
diff --git a/cpulimit/Makefile b/cpulimit/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cpulimit
 PKG_VERSION:=0.3.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/denji/cpulimit/tar.gz/$(PKG_VERSION)?

diff --git a/jpcre2/Makefile b/jpcre2/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jpcre2
 PKG_VERSION:=10.32.01
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)?

diff --git a/libcron/Makefile b/libcron/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcron
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/PerMalmberg/libcron.git

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
 PKG_VERSION:=1.11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
@@ -47,36 +47,39 @@ o = s:taboption("Main", Flag, "enabled", translate("Main switch"))
 o.rmempty = false
 
 local auto_switch_tip
-local auto_switch_flag
+local shunt_remark
 local current_node = luci.sys.exec(string.format("[ -f '/tmp/etc/%s/id/global' ] && echo -n $(cat /tmp/etc/%s/id/global)", appname, appname))
 if current_node and current_node ~= "" and current_node ~= "nil" then
 	local n = uci:get_all(appname, current_node)
 	if n then
 		if tonumber(m:get("@auto_switch[0]", "enable") or 0) == 1 then
-			auto_switch_flag = ""
 			if n.protocol == "_shunt" then
 				local shunt_logic = tonumber(m:get("@auto_switch[0]", "shunt_logic"))
-				if shunt_logic == 1 then
-					auto_switch_flag = "default"
-				elseif shunt_logic == 2 then
-					auto_switch_flag = "main"
-				end
-				current_node = luci.sys.exec(string.format("[ -f '/tmp/etc/%s/id/global_%s' ] && echo -n $(cat /tmp/etc/%s/id/global_%s)", appname, auto_switch_flag, appname, auto_switch_flag))
-				if current_node and current_node ~= "" and current_node ~= "nil" then
-					n = uci:get_all(appname, current_node)
+				if shunt_logic == 1 or shunt_logic == 2 then
+					if shunt_logic == 1 then
+						shunt_remark = "default"
+					elseif shunt_logic == 2 then
+						shunt_remark = "main"
+					end
+					current_node = luci.sys.exec(string.format("[ -f '/tmp/etc/%s/id/global_%s' ] && echo -n $(cat /tmp/etc/%s/id/global_%s)", appname, shunt_remark, appname, shunt_remark))
+					if current_node and current_node ~= "" and current_node ~= "nil" then
+						n = uci:get_all(appname, current_node)
+					end
 				end
 			end
-			local remarks = api.get_node_remarks(n)
-			local url = api.url("node_config", n[".name"])
-			auto_switch_tip = translatef("Current node: %s", string.format('<a href="%s">%s</a>', url, remarks)) .. "<br />"
+			if n then
+				local remarks = api.get_node_remarks(n)
+				local url = api.url("node_config", n[".name"])
+				auto_switch_tip = translatef("Current node: %s", string.format('<a href="%s">%s</a>', url, remarks)) .. "<br />"
+			end
 		end
 	end
 end
 
 ---- Node
 node = s:taboption("Main", ListValue, "node", "<a style='color: red'>" .. translate("Node") .. "</a>")
 node:value("nil", translate("Close"))
-if auto_switch_flag == "" and auto_switch_tip then
+if not shunt_remark and auto_switch_tip then
 	node.description = auto_switch_tip
 end
 
@@ -128,7 +131,7 @@ if (has_v2ray or has_xray) and #nodes_table > 0 then
 		o.write = function(self, section, value)
 			m:set(v.id, id, value)
 		end
-		if auto_switch_flag == "default" and auto_switch_tip then
+		if shunt_remark == "default" and auto_switch_tip then
 			o.description = auto_switch_tip
 		end
 
@@ -145,7 +148,7 @@ if (has_v2ray or has_xray) and #nodes_table > 0 then
 		o.write = function(self, section, value)
 			m:set(v.id, id, value)
 		end
-		if auto_switch_flag == "main" and auto_switch_tip then
+		if shunt_remark == "main" and auto_switch_tip then
 			o.description = auto_switch_tip
 		end
 	end

diff --git a/ngrokc/Makefile b/ngrokc/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ngrokc
 PKG_VERSION:=1.55
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/dosgo/ngrok-c.git

diff --git a/njitclient/Makefile b/njitclient/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=njit8021xclient
 PKG_BASE_VERSION:=2.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/bitdust/njit8021xclient.git

diff --git a/oscam/Makefile b/oscam/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oscam
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nx111/oscam.git

diff --git a/quickjspp/Makefile b/quickjspp/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quickjspp
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/ftk/quickjspp.git

diff --git a/rapidjson/Makefile b/rapidjson/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rapidjson
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git

diff --git a/subconverter/Makefile b/subconverter/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subconverter
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git

diff --git a/toml11/Makefile b/toml11/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=toml11
 PKG_VERSION:=3.7.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ToruNiina/toml11/tar.gz/v$(PKG_VERSION)?