OpenWrt/kenzok8-passwall
1
0
Fork 0
mirror of https://github.com/kenzok8/openwrt-packages.git synced 2025-01-09 03:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2022-08-03 20:18:49

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-03 20:18:49 +08:00
parent b830e88b5d
commit 272ecd4387
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
luci-app-store/Makefile
View File

@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI based ipk store LUCI_TITLE:=LuCI based ipk store
LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team 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_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 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 MUST be empty for luci.mk
PKG_RELEASE:= PKG_RELEASE:=
ISTORE_UI_VERSION:=0.1.11 ISTORE_UI_VERSION:=0.1.12
ISTORE_UI_RELEASE:=1 ISTORE_UI_RELEASE:=2
PKG_HASH:=e78b07c257c38892f028faeaea3a64ee47e11137523e1c046df95c87be7abf90 PKG_HASH:=1d0bf08623d080beb50fe0dc560a45dc4b8e7c3bc50df80ecb1d0f037709b983
PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz
PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE) PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE)

16
luci-app-store/luasrc/controller/store.lua
View File

@ -125,6 +125,9 @@ function store_index()
if fs.access("/usr/libexec/istore/backup") then if fs.access("/usr/libexec/istore/backup") then
features[#features+1] = "backup" features[#features+1] = "backup"
end 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}) luci.template.render("store/main", {prefix=luci.dispatcher.build_url(unpack(page_index)),id=user_id(),lang=vue_lang(),features=features})
end end
@ -238,17 +241,24 @@ function store_action(param)
ret = data ret = data
else else
local pkg = luci.http.formvalue("package") 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 pkg then
if action == "update" or action == "install" then if action == "update" or action == "install" then
code, out, err = _action(myopkg, action, metapkg) code, out, err = _action(myopkg, action, metapkg)
else else
local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json")) local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json"))
local pkgs = meta.depends local pkgs = {}
table.insert(pkgs, metapkg)
if action == "upgrade" then if action == "upgrade" then
pkgs = meta.depends
table.insert(pkgs, metapkg)
code, out, err = _action(myopkg, action, unpack(pkgs)) code, out, err = _action(myopkg, action, unpack(pkgs))
else -- remove 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)) code, out, err = _action(myopkg, action, unpack(pkgs))
fs.unlink("/tmp/luci-indexcache") fs.unlink("/tmp/luci-indexcache")
end end

3
luci-lib-taskd/Makefile
View File

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