gluon-alfred: reduce usage of util.exec, improve table formatting

gluon/gluon-alfred/files/lib/gluon/alfred/announce.d/software/firmware

@@ -1,4 +1,4 @@
-return
-	{ base = 'gluon-' .. util.trim(fs.readfile('/lib/gluon/gluon-version'))
-	, release = util.trim(fs.readfile('/lib/gluon/release'))
-	}
+return {
+	base = 'gluon-' .. util.trim(fs.readfile('/lib/gluon/gluon-version')),
+	release = util.trim(fs.readfile('/lib/gluon/release')),
+}

gluon/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/idletime

@@ -1 +1 @@
-return tonumber(util.trim(util.exec("cut -d' ' -f2 /proc/uptime")))
+return tonumber(fs.readfile('/proc/uptime'):match('^[^ ]+ ([^ ]+)'))

gluon/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/loadavg

@@ -1 +1 @@
-return tonumber(util.trim(util.exec("cut -d' ' -f1 /proc/loadavg")))
+return tonumber(fs.readfile('/proc/loadavg'):match('^([^ ]+) '))

gluon/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/uptime

@@ -1 +1 @@
-return tonumber(util.trim(util.exec("cut -d' ' -f1 /proc/uptime")))
+return tonumber(fs.readfile('/proc/uptime'):match('^([^ ]+) '))

gluon/gluon-autoupdater/files/lib/gluon/alfred/announce.d/software/autoupdater

@@ -1,7 +1,7 @@
 local autoupdater = uci:get_all('autoupdater', 'settings')
 if autoupdater then
-	return
-		{ branch = autoupdater['branch']
-		, enabled = uci:get_bool('autoupdater', 'settings', 'enabled')
-		}
+	return {
+		branch = autoupdater['branch'],
+		enabled = uci:get_bool('autoupdater', 'settings', 'enabled'),
+	}
 end

gluon/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/software/batman-adv

@@ -1,3 +1,3 @@
-local version = util.exec('batctl -v'):match('%[batman%-adv: ([^%]]+)%]')
+local version = util.trim(fs.readfile('/sys/module/batman_adv/version'))
 
 return { version = version }

gluon/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/statistics/traffic

@@ -7,10 +7,10 @@ end
 
 local traffic = {}
 for _, class in ipairs({'rx', 'tx', 'forward', 'mgmt_rx', 'mgmt_tx'}) do
-	traffic[class] =
-		{ bytes = fields[class .. '_bytes']
-		, packets = fields[class]
-		}
+	traffic[class] = {
+		bytes = fields[class .. '_bytes'],
+		packets = fields[class],
+	}
 end
 traffic['tx']['dropped'] = fields['tx_dropped']
 

gluon/gluon-mesh-vpn-fastd/files/lib/gluon/alfred/announce.d/software/fastd

@@ -1,4 +1,4 @@
-return
-	{ enabled = uci:get_bool('fastd', 'mesh_vpn', 'enabled')
-	, version = util.trim(util.exec("fastd -v | cut -d' ' -f2"))
-	}
+return {
+	enabled = uci:get_bool('fastd', 'mesh_vpn', 'enabled'),
+	version = util.exec('fastd -v'):match('^[^%s]+%s+([^\n]+)'),
+}

gluon/gluon-node-info/files/lib/gluon/alfred/announce.d/location

@@ -1,6 +1,6 @@
 if uci:get_first('gluon-node-info', 'location', 'share_location', false) then
-	return
-		{ latitude = tonumber(uci:get_first('gluon-node-info', 'location', 'latitude'))
-		, longitude = tonumber(uci:get_first('gluon-node-info', 'location', 'longitude'))
-		}
+	return {
+		latitude = tonumber(uci:get_first('gluon-node-info', 'location', 'latitude')),
+		longitude = tonumber(uci:get_first('gluon-node-info', 'location', 'longitude')),
+	}
 end