cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-10-29 19:05:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚀 Sync 2026-04-17 23:47:35

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-04-17 23:47:35 +08:00
1 parent 48d996e330
commit f7d50378d8
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-easytier/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
-include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.0)
PKG_RELEASE:=4
PKG_RELEASE:=5
LUCI_TITLE:=LuCI support for EasyTier
LUCI_DEPENDS:=+kmod-tun +easytier +luci-compat
luci-app-easytier/luasrc/controller/easytier.lua
+6 -6
View File
@@ -138,7 +138,7 @@ function act_status()
if cached_webtag and cached_webtag ~= "" then
e.etwebtag = cached_webtag:gsub("[\r\n]+", "")
else
local easytierwebbin = uci:get_first("easytier", "easytier", "easytierwebbin") or "/usr/bin/easytier-web"
local easytierwebbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web"
e.etwebtag = safe_exec(easytierwebbin .. " -V 2>/dev/null | sed 's/^[^0-9]*//'")
if e.etwebtag == "" or e.etwebtag == nil then e.etwebtag = "unknown" end
local f = io.open("/tmp/easytierweb.tag", "w")
@@ -160,7 +160,7 @@ function get_upload_config()
local config = {
easytierbin = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core",
webbin = uci:get_first("easytier", "easytier", "easytierwebbin") or "/usr/bin/easytier-web",
webbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web",
github_proxys = {},
fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.0"
}
@@ -198,7 +198,7 @@ function save_upload_config()
-- 保存配置
uci:set("easytier", "@easytier[0]", "easytierbin", data.easytierbin or "/usr/bin/easytier-core")
uci:set("easytier", "@easytier[0]", "easytierwebbin", data.webbin or "/usr/bin/easytier-web")
uci:set("easytier", "@easytier[0]", "webbin", data.webbin or "/usr/bin/easytier-web")
uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.0")
-- 删除旧的代理列表
@@ -479,7 +479,7 @@ function upload_binary()
end
local core_path = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core"
local web_path = uci:get_first("easytier", "easytier", "easytierwebbin") or "/usr/bin/easytier-web"
local web_path = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web"
for _, bin in ipairs(valid_bins) do
local final_path
@@ -536,7 +536,7 @@ function upload_binary()
end
local core_path = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core"
local web_path = uci:get_first("easytier", "easytier", "easytierwebbin") or "/usr/bin/easytier-web"
local web_path = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web"
local final_path
if filename == "easytier-web-embed" then
@@ -1053,7 +1053,7 @@ function download_easytier()
-- 3. 从UCI获取路径并安装
local uci = require "luci.model.uci".cursor()
local easytierbin = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core"
local easytierwebbin = uci:get_first("easytier", "easytier", "easytierwebbin") or "/usr/bin/easytier-web"
local easytierwebbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web"
local core_dir = easytierbin:match("^(.*/)[^/]+$") or "/usr/bin/"
luci-app-passwall/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.4.15
PKG_RELEASE:=78
PKG_RELEASE:=79
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
luci-app-passwall2/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.4.10
PKG_RELEASE:=34
PKG_RELEASE:=35
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \