From a27d2dbc32785c3389ea77a26714e7f6c67c9185 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 17 Dec 2022 15:00:24 +0100 Subject: luci-base, luci-mod-status: expose LuCI version via ubus Instead of scraping the LuCI version from Lua sources, fetch it via ubus in order to be independent from the Lua runtime. Fixes: #6154 Signed-off-by: Jo-Philipp Wich --- .../luci-static/resources/view/status/include/10_system.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'modules/luci-mod-status/htdocs/luci-static') diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js index ae7efa3e75..45f7b4acae 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/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' @@ -20,7 +25,7 @@ return baseclass.extend({ return Promise.all([ L.resolveDefault(callSystemBoard(), {}), L.resolveDefault(callSystemInfo(), {}), - fs.lines('/usr/lib/lua/luci/version.lua') + L.resolveDefault(callLuciVersion(), { revision: _('unknown version'), branch: 'LuCI' }) ]); }, @@ -29,11 +34,7 @@ return baseclass.extend({ systeminfo = data[1], luciversion = data[2]; - luciversion = luciversion.filter(function(l) { - return l.match(/^\s*(luciname|luciversion)\s*=/); - }).map(function(l) { - return l.replace(/^\s*\w+\s*=\s*['"]([^'"]+)['"].*$/, '$1'); - }).join(' '); + luciversion = luciversion.branch + ' ' + luciversion.revision; var datestr = null; -- cgit v1.2.3