From 4f6c139d0a3112b6c36c1d1156f4fb97a60662bd Mon Sep 17 00:00:00 2001 From: actions-user Date: Fri, 15 Nov 2024 12:16:55 +0800 Subject: [PATCH] update 2024-11-15 12:16:55 --- luci-app-passwall/luasrc/passwall/api.lua | 6 +++++- mihomo/Makefile | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua index c27f14aa..71c4a7d6 100644 --- a/luci-app-passwall/luasrc/passwall/api.lua +++ b/luci-app-passwall/luasrc/passwall/api.lua @@ -987,7 +987,11 @@ function to_move(app_name,file) end function get_version() - return sys.exec("echo -n $(opkg list-installed luci-app-passwall |awk '{print $3}')") + local version = sys.exec("opkg list-installed luci-app-passwall 2>/dev/null | awk '{print $3}'") + if not version or #version == 0 then + version = sys.exec("apk info luci-app-passwall 2>/dev/null | awk '{print $2}'") + end + return version or "" end function to_check_self() diff --git a/mihomo/Makefile b/mihomo/Makefile index 79f513fe..fb69e379 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mihomo -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git -PKG_SOURCE_DATE:=2024-11-05 -PKG_SOURCE_VERSION:=ce52c3438bf5c09f1fe58f6034a9ff7ee4ac3c25 -PKG_MIRROR_HASH:=5df3e7e3e9aceb0ec1facde407d973cb5395a1b1a595aa587d59f138ebb8ba29 +PKG_SOURCE_DATE:=2024-11-14 +PKG_SOURCE_VERSION:=de19f927e86573a7a97159e3b9925049f06d4563 +PKG_MIRROR_HASH:=931d397995b2da9e97f3f050d4650fa9013980d6c523df40bca3b58822a42409 PKG_LICENSE:=MIT PKG_MAINTAINER:=Joseph Mory @@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 -PKG_BUILD_VERSION:=alpha-ce52c34 +PKG_BUILD_VERSION:=alpha-de19f92 PKG_BUILD_TIME:=$(shell date -u -Iseconds) GO_PKG:=github.com/metacubex/mihomo