🌴 Sync 2025-12-04 00:14:48

luci-app-store/Makefile

@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-lib-ipkg +tar +libuci-lua +mount-utils +luci-lib
 LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.30-1
+PKG_VERSION:=0.1.31-1
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 

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

@@ -264,6 +264,7 @@ local function get_installed_and_cache()
     if not ms then
         result = {}
     elseif not cs or ms["mtime"] > cs["mtime"] then
+        local cacheable = true
         local itr = fs.dir(metadir)
         local data = {}
         if itr then
@@ -287,10 +288,20 @@ local function get_installed_and_cache()
                                 broken = true,
                             }
                         end
+                        local time = nil
                         local metapkg = metapkgpre .. meta.name
                         local status = ipkg.status(metapkg)
                         if next(status) ~= nil then
-                            meta.time = tonumber(status[metapkg]["Installed-Time"])
+                            time = status[metapkg]["Installed-Time"]
+                        else
+                            local istat = fs.stat("/usr/lib/opkg/info/" .. metapkg .. ".list")
+                            if istat ~= nil then
+                                time = istat["mtime"]
+                            end
+                            cacheable = false
+                        end
+                        if time ~= nil then
+                            meta.time = tonumber(time)
                             data[#data+1] = meta
                         end
                     end
@@ -298,11 +309,13 @@ local function get_installed_and_cache()
             end
         end
         result = data
-        fs.mkdirr(cachedir)
-        local oflags = nixio.open_flags("rdwr", "creat")
-        local mfile, code, msg = nixio.open(cachefile, oflags)
-        mfile:writeall(jsonc.stringify(result))
-        mfile:close()
+        if cacheable then
+            fs.mkdirr(cachedir)
+            local oflags = nixio.open_flags("rdwr", "creat")
+            local mfile, code, msg = nixio.open(cachefile, oflags)
+            mfile:writeall(jsonc.stringify(result))
+            mfile:close()
+        end
     else
         result = jsonc.parse(fs.readfile(cachefile) or "")
     end

luci-theme-aurora/.dev/src/media/main.css

@@ -12,8 +12,6 @@
 }
 
 :root {
-  --background: oklch(0.9824 0.0013 286.3757);
-  --text: oklch(0.3211 0 0);
   --background-start: oklch(0.984 0.003 247.858);
   --background-mid: oklch(0.968 0.007 247.896);
   --background-end: oklch(0.929 0.013 255.508);
@@ -30,7 +28,6 @@
   --destructive: oklch(0.94 0.05 25);
   --destructive-text: oklch(0.35 0.12 25);
   --destructive-hover: oklch(0.92 0.06 25);
-  --ring: #0f2e5d;
 
   --success: oklch(0.94 0.05 160);
   --success-text: oklch(0.32 0.09 165);
@@ -96,8 +93,6 @@
 }
 
 [data-darkmode="true"] {
-  --background: oklch(0.9824 0.0013 286.3757);
-  --text: oklch(0.3211 0 0);
   --background-start: oklch(0.2077 0.0398 265.75);
   --background-mid: oklch(0.3861 0.059 188.42);
   --background-end: oklch(0.4318 0.0865 166.91);
@@ -114,8 +109,6 @@
   --destructive: oklch(0.28 0.12 25/0.3);
   --destructive-text: oklch(0.88 0.14 25);
   --destructive-hover: oklch(0.32 0.14 25/0.4);
-  --ring: #0f2e5d;
-  --border: oklch(0.8699 0 0);
 
   --success: oklch(0.28 0.09 165/0.3);
   --success-text: oklch(0.92 0.09 160);
@@ -181,8 +174,6 @@
 }
 
 @theme inline {
-  --color-background: var(--background);
-  --color-text: var(--text);
   --color-aurora-start: var(--background-start);
   --color-aurora-mid: var(--background-mid);
   --color-aurora-end: var(--background-end);
@@ -208,8 +199,6 @@
 
   --color-accent: var(--accent);
   --color-accent-text: var(--accent-text);
-  --color-ring: var(--ring);
-  --color-border: var(--border);
 
   --color-success: var(--success);
   --color-success-text: var(--success-text);

luci-theme-aurora/ucode/template/themes/aurora/header.ut

@@ -15,9 +15,7 @@
 
 	const boardinfo = ubus.call('system', 'board');
 	const uci = cursor();
-	uci.load('aurora');
-	const colors = uci.get_all('aurora', 'colors') || {};
-	const dark_colors = uci.get_all('aurora', 'dark_colors') || {};
+	const tokens = uci.get_all('aurora', 'theme') || {};
 
 	http.prepare_content('text/html; charset=UTF-8');
 -%}
@@ -72,16 +70,20 @@
 		{% if (css): %}
 		<style title="text/css">{{ css }}</style>
 		{% endif %}
-		{% if (length(colors) || length(dark_colors)): %}
+		{% if (length(tokens)): %}
 		<style>
 			:root {
-				{% for (let key in colors): %}
-				--{{ replace(key, '_', '-') }}: {{ colors[key] }};
+				{% for (let key in tokens): %}
+				{% if (index(key, 'dark_') != 0): %}
+				--{{ replace(key, '_', '-') }}: {{ tokens[key] }};
+				{% endif %}
 				{% endfor %}
 			}
 			[data-darkmode="true"] {
-				{% for (let key in dark_colors): %}
-				--{{ replace(key, '_', '-') }}: {{ dark_colors[key] }};
+				{% for (let key in tokens): %}
+				{% if (index(key, 'dark_') == 0): %}
+				--{{ replace(substr(key, 5), '_', '-') }}: {{ tokens[key] }};
+				{% endif %}
 				{% endfor %}
 			}
 		</style>

nikki/files/nikki.conf

@@ -195,6 +195,7 @@ config router_access_control
 	list 'cgroup' 'services/sysntpd'
 	list 'cgroup' 'services/tailscale'
 	list 'cgroup' 'services/zerotier'
+	option 'dns' '0'
 	option 'proxy' '0'
 
 config router_access_control

quickstart/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_quickstart:=$(ARCH)
 
 PKG_NAME:=quickstart
-PKG_VERSION:=0.11.12
+PKG_VERSION:=0.11.13
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/
-PKG_HASH:=9d1a31b8bf365af79c0fe6048ccc66a7ab7f3c60e4e18796ea68db4427eb0a01
+PKG_HASH:=f9b3161f540b522d29fa28749da5fca34472f626e1ecd1f47d7aa279b6d0d111
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)