update 2022-08-03 20:18:49

luci-app-store/Makefile

@@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI based ipk store
 LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
 LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua +mount-utils +luci-lib-taskd
+LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.15)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.11-3
+PKG_VERSION:=0.1.12-2
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 
-ISTORE_UI_VERSION:=0.1.11
-ISTORE_UI_RELEASE:=1
-PKG_HASH:=e78b07c257c38892f028faeaea3a64ee47e11137523e1c046df95c87be7abf90
+ISTORE_UI_VERSION:=0.1.12
+ISTORE_UI_RELEASE:=2
+PKG_HASH:=1d0bf08623d080beb50fe0dc560a45dc4b8e7c3bc50df80ecb1d0f037709b983
 
 PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz
 PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE)

luci-app-store/luasrc/controller/store.lua

@@ -125,6 +125,9 @@ function store_index()
     if fs.access("/usr/libexec/istore/backup") then
         features[#features+1] = "backup"
     end
+    if luci.sys.call("which docker >/dev/null 2>&1") == 0 then
+        features[#features+1] = "docker"
+    end
 
     luci.template.render("store/main", {prefix=luci.dispatcher.build_url(unpack(page_index)),id=user_id(),lang=vue_lang(),features=features})
 end
@@ -238,17 +241,24 @@ function store_action(param)
         ret = data
     else
         local pkg = luci.http.formvalue("package")
-        local metapkg = metapkgpre .. pkg
+        local metapkg = pkg and (metapkgpre .. pkg) or ""
         if action == "update" or pkg then
             if action == "update" or action == "install" then
                 code, out, err = _action(myopkg, action, metapkg)
             else
                 local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json"))
-                local pkgs = meta.depends
-                table.insert(pkgs, metapkg)
+                local pkgs = {}
                 if action == "upgrade" then
+                    pkgs = meta.depends
+                    table.insert(pkgs, metapkg)
                     code, out, err = _action(myopkg, action, unpack(pkgs))
                 else -- remove
+                    for _, dep in ipairs(meta.depends) do
+                        if dep ~= "docker-deps" then
+                            pkgs[#pkgs+1] = dep
+                        end
+                    end
+                    table.insert(pkgs, metapkg)
                     code, out, err = _action(myopkg, action, unpack(pkgs))
                     fs.unlink("/tmp/luci-indexcache")
                 end

luci-lib-taskd/Makefile

@@ -8,9 +8,10 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Task library
 LUCI_DEPENDS:=+luci-lib-xterm +taskd
+LUCI_EXTRA_DEPENDS:=taskd (>=1.0.3-1)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.15
 PKG_RELEASE:=
 PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>