diff --git a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/software/firmware b/package/gluon-alfred/files/lib/gluon/alfred/announce.d/software/firmware index 0a1ec31078efe628a0fc4e8e5e4ecfda768d5c43..cf50f79fc67b6c1c72a749c07541fc3991d9369e 100644 --- a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/software/firmware +++ b/package/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')), +} diff --git a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/idletime b/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/idletime index 93165f05cb7e6d485ee7b3402b8d95088ba717da..845de268074766e91a7c5d8d52085ae0846f286e 100644 --- a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/idletime +++ b/package/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('^[^ ]+ ([^ ]+)')) diff --git a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/loadavg b/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/loadavg index dce5d440e2bbfef34bd4e51aab0f61b78f293f5c..d79973aa7d405cfea3a920416651f68b84a09010 100644 --- a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/loadavg +++ b/package/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('^([^ ]+) ')) diff --git a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/uptime b/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/uptime index 2fd6e30179e6f492b8ef0cff97efe802a54dd5f9..0bc45beaeae3bdb55973289a1862b1fad65be0a9 100644 --- a/package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/uptime +++ b/package/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('^([^ ]+) ')) diff --git a/package/gluon-autoupdater/files/lib/gluon/alfred/announce.d/software/autoupdater b/package/gluon-autoupdater/files/lib/gluon/alfred/announce.d/software/autoupdater index 7745d1a2b93fcbcb6d98cffc2531ebae09d8efe6..75a67578d84bcae991b1f34b4eff9053fe9e35c3 100644 --- a/package/gluon-autoupdater/files/lib/gluon/alfred/announce.d/software/autoupdater +++ b/package/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 diff --git a/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/software/batman-adv b/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/software/batman-adv index 4af75985f49929c2e0d5afe8bb309466f1130ea7..2c8390d6122148818b761369e24bd0e0f5549653 100644 --- a/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/software/batman-adv +++ b/package/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 } diff --git a/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/statistics/traffic b/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/statistics/traffic index 7667e4f5fb210a3586fcc3dade1f4542e3f9e05a..378125e5e07d60a5126f84a6191ef5bfcb455b06 100644 --- a/package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/statistics/traffic +++ b/package/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'] diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/alfred/announce.d/software/fastd b/package/gluon-mesh-vpn-fastd/files/lib/gluon/alfred/announce.d/software/fastd index 6abbbbc7dc1ef064abd497a195a20587d40eddd7..bbfbda089e4075e65a88925e1aa8be11c9a28e40 100644 --- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/alfred/announce.d/software/fastd +++ b/package/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]+)'), +} diff --git a/package/gluon-node-info/files/lib/gluon/alfred/announce.d/location b/package/gluon-node-info/files/lib/gluon/alfred/announce.d/location index 3060210c36e83ffcbf881c6f6b7a4591d041afc8..eb9b3a9a468b8059464226713366f15c6c542c09 100644 --- a/package/gluon-node-info/files/lib/gluon/alfred/announce.d/location +++ b/package/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