adapt openwrt-23.05

files/generic/090-cover-index_files

@@ -3,7 +3,7 @@
 [ ! -f '/etc/rpcd_10_system.js' ] || \
 	mv -f '/etc/rpcd_10_system.js' '/www/luci-static/resources/view/status/include/10_system.js'
 [ ! -f '/etc/rpcd_luci' ] || \
-	mv -f '/etc/rpcd_luci' '/usr/libexec/rpcd/luci'
+	mv -f '/etc/rpcd_luci' '/usr/share/rpcd/ucode/luci'
 /etc/init.d/rpcd restart
 
 exit 0

files/generic/10_system.js

@@ -3,6 +3,11 @@
 'require fs';
 'require rpc';
 
+var callLuciVersion = rpc.declare({
+	object: 'luci',
+	method: 'getVersion'
+});
+
 var callSystemBoard = rpc.declare({
 	object: 'system',
 	method: 'board'
@@ -44,7 +49,7 @@ return baseclass.extend({
 			L.resolveDefault(callCPUInfo(), {}),
 			L.resolveDefault(callCPUUsage(), {}),
 			L.resolveDefault(callTempInfo(), {}),
-			fs.lines('/usr/lib/lua/luci/version.lua')
+			L.resolveDefault(callLuciVersion(), { revision: _('unknown version'), branch: 'LuCI' })
 		]);
 	},
 
@@ -57,11 +62,7 @@ return baseclass.extend({
 		    tempinfo    = data[5],
 		    luciversion = data[6];
 
-		luciversion = luciversion.filter(function(l) {
+		luciversion = luciversion.branch + ' ' + luciversion.revision;
-			return l.match(/^\s*(luciname|luciversion)\s*=/);
-		}).map(function(l) {
-			return l.replace(/^\s*\w+\s*=\s*['"]([^'"]+)['"].*$/, '$1');
-		}).join(' ');
 
 		var datestr = null;