From caf494496d5be1b315aeba39923a28ea4207212b Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Mon, 8 Jul 2024 16:23:03 +0800
Subject: [PATCH] update 2024-07-08 16:23:03

---
 linkease/Makefile               |  7 +++--
 luci-app-store/Makefile         |  2 +-
 luci-app-store/root/bin/is-opkg | 11 +++++++-
 luci-app-store/swagger.yaml     | 47 ++++++++++++++++++---------------
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/linkease/Makefile b/linkease/Makefile
index 23ade9b42..58ff67753 100644
--- a/linkease/Makefile
+++ b/linkease/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_LINKEASE:=$(ARCH)
 
 PKG_NAME:=linkease
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=$(PKG_ARCH_LINKEASE)-3
+PKG_VERSION:=1.6.2
+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:=55a08490e12b953a078178ea9b6d11185f71bbfb1c87a0ab25acbfeb7dbe5e55
+PKG_HASH:=859a536676ebdc54201a7948f48c295d28362a76f5bcc196007dd0cd6f20ef78
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)
 
@@ -59,7 +59,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linkease.$(PKG_ARCH_LINKEASE) $(1)/usr/sbin/linkease
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/heif-converter.$(PKG_ARCH_LINKEASE) $(1)/usr/sbin/heif-converter
 	$(INSTALL_BIN) ./files/linkease-config.sh $(1)/usr/sbin/linkease-config.sh
-	$(INSTALL_BIN) ./files/aria2.sh $(1)/usr/sbin/linkease-plugins/aria2.sh
 	$(INSTALL_CONF) ./files/linkease.config $(1)/etc/config/linkease
 	$(INSTALL_BIN) ./files/linkease.init $(1)/etc/init.d/linkease
 	$(INSTALL_BIN) ./files/linkease.uci-default $(1)/etc/uci-defaults/linkease
diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile
index c26cb7abd..cde12244f 100644
--- a/luci-app-store/Makefile
+++ b/luci-app-store/Makefile
@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua
 LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.24-0
+PKG_VERSION:=0.1.24-1
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 
diff --git a/luci-app-store/root/bin/is-opkg b/luci-app-store/root/bin/is-opkg
index 5fbe84749..e86887132 100755
--- a/luci-app-store/root/bin/is-opkg
+++ b/luci-app-store/root/bin/is-opkg
@@ -222,6 +222,15 @@ try_autoconf() {
     /usr/libexec/istorea/${ISTORE_AUTOCONF}.sh
 }
 
+try_upgrade_depends() {
+    local pkg="$1"
+    if [[ $pkg == app-meta-* ]]; then
+        local deps=$(grep '^Depends: ' /usr/lib/opkg/info/$pkg.control | busybox sed -e 's/^Depends: //' -e 's/,/\n/g' -e 's/ //g' | grep -vFw libc | xargs echo)
+        [ -z "$deps" ] || opkg_wrap_mirrors install $deps
+    fi
+    return 0
+}
+
 usage() {
     echo "usage: is-opkg sub-command [arguments...]"
     echo "where sub-command is one of:"
@@ -245,7 +254,7 @@ case $action in
     ;;
     "install")
         check_space
-        wrapped_in_update opkg_wrap_mirrors install "$@" && try_autoconf
+        wrapped_in_update opkg_wrap_mirrors install "$@" && try_upgrade_depends "$1" && try_autoconf
     ;;
     "autoconf")
         try_autoconf
diff --git a/luci-app-store/swagger.yaml b/luci-app-store/swagger.yaml
index fcd475525..c5941679d 100644
--- a/luci-app-store/swagger.yaml
+++ b/luci-app-store/swagger.yaml
@@ -215,7 +215,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: "#/definitions/ResponseStoreCheckSelfUpgrade"
+            $ref: "#/definitions/ResponseStoreGetBlockDevices"
   /cgi-bin/luci/admin/store/configured:
     get:
       tags:
@@ -460,6 +460,29 @@ definitions:
       error:
         type: string
         description: "当result为bad时，此处返回错误日志"
+  StoreEntrysh:
+    type: object
+    description: "状态和入口信息，不同插件可能有些不一样，仅列出常用公共参数"
+    properties:
+      app:
+        type: string
+        description: "插件名称"
+      docker:
+        type: boolean
+        description: "如果是docker插件"
+      running:
+        type: boolean
+        description: "是否运行中"
+      deployed:
+        type: boolean
+        description: "如果是docker插件且未运行，则是否已经部署"
+      web:
+        type: string
+        description: "url"
+      href:
+        type: string
+        description: "web端直接跳转url"
+    
   ResponseStoreEntrysh:
     type: object
     properties:
@@ -470,27 +493,7 @@ definitions:
         description: "处理成功的结果集"
         type: array
         items:
-          type: object
-          description: "状态和入口信息，不同插件可能有些不一样，仅列出常用公共参数"
-          properties:
-            app:
-              type: string
-              description: "插件名称"
-            docker:
-              type: boolean
-              description: "如果是docker插件"
-            running:
-              type: boolean
-              description: "是否运行中"
-            deployed:
-              type: boolean
-              description: "如果是docker插件且未运行，则是否已经部署"
-            web:
-              type: string
-              description: "url"
-            href:
-              type: string
-              description: "web端直接跳转url"
+          $ref: "#/definitions/StoreEntrysh"
       errors:
         description: "处理失败的结果集"
         type: array