--- a/luci-app-store/root/etc/uci-defaults/luci-app-store +++ b/luci-app-store/root/etc/uci-defaults/luci-app-store @@ -2,6 +2,12 @@ /etc/init.d/istore boot +TARGET="/www/luci-static/istore/index.js" + +if [ -f "$TARGET" ]; then + sed -i 's/class:"tabs"/class:"cbi-tabmenu"/g' "$TARGET" +fi + if [ -z "`uci -q get istore.istore.hide_docker`" ] && ! which docker >/dev/null; then uci -q batch <<-EOF >/dev/null set istore.istore.hide_docker=1 --- a/luci-app-store/luasrc/controller/store.lua +++ b/luci-app-store/luasrc/controller/store.lua @@ -3,7 +3,7 @@ module("luci.controller.store", package.seeall) local myopkg = "is-opkg" local is_backup = "/usr/libexec/istore/backup" local is_overlay_backup = "/usr/libexec/istore/overlay-backup" -local page_index = {"admin", "store", "pages"} +local page_index = {"admin", "services", "store", "pages"} function index() local function store_api(action, onlypost) @@ -14,8 +14,8 @@ function index() local action - entry({"admin", "store"}, call("redirect_index"), _("iStore"), 31) - entry({"admin", "store", "pages"}, call("store_index")).leaf = true + entry({"admin", "services", "store"}, call("redirect_index"), _("iStore"), 31).dependent = true + entry({"admin", "services", "store", "pages"}, call("store_index")).leaf = true if nixio.fs.access("/usr/lib/lua/luci/view/store/main_dev.htm") then entry({"admin", "store", "dev"}, call("store_dev")).leaf = true end --- a/luci-app-store/src/root-opkg/etc/opkg/compatfeeds.conf +++ b/luci-app-store/src/root-opkg/etc/opkg/compatfeeds.conf @@ -1 +1 @@ -src/gz istore_compat https://istore.istoreos.com/repo/all/compat \ No newline at end of file +# src/gz istore_compat https://istore.istoreos.com/repo/all/compat --- a/luci-app-store/Makefile +++ b/luci-app-store/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI based ipk/apk store LUCI_DESCRIPTION:=luci-app-store is a ipk/apk store developed by LinkEase team -LUCI_DEPENDS:=+curl +tar +libuci-lua +mount-utils +luci-lib-taskd +LUCI_DEPENDS:=@(x86_64||aarch64) +curl +tar +libuci-lua +mount-utils +luci-lib-taskd LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19) LUCI_PKGARCH:=all --- a/luci-app-store/luasrc/view/store/main.htm +++ b/luci-app-store/luasrc/view/store/main.htm @@ -26,6 +26,8 @@