From abe4a440d0e547cd0cd0318f6641fefc608c2e0b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=B8=20Sync=202024-11-15=2016:31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linkease/nas/linkease/Makefile            | 4 ++--
 luci-app-passwall/luasrc/passwall/api.lua | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/linkease/nas/linkease/Makefile b/linkease/nas/linkease/Makefile
index d8fcb5b6..2e9994e4 100644
--- a/linkease/nas/linkease/Makefile
+++ b/linkease/nas/linkease/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_LINKEASE:=$(ARCH)
 
 PKG_NAME:=linkease
-PKG_VERSION:=1.6.7
+PKG_VERSION:=1.6.8
 PKG_RELEASE:=$(PKG_ARCH_LINKEASE)-1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fw0.koolcenter.com/binary/LinkEase/LinuxStorage/
-PKG_HASH:=641083ec699ca0e52ac8badf11be5ff963a6796cb0b960eefada7ca9b9afe647
+PKG_HASH:=d6c600f8df604d62fee98f42dcf4e6ea8b919c9a005912a30c55592397e35ca6
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)
 
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()