nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthias Schiffer 2014-06-10 15:44:35 +02:00
parent ea7774c0b6
commit bc54f80dfd
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/gluon-alfred/files/lib/gluon/alfred/announce.d/software/firmware
View File

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

2
package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/idletime
View File

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

2
package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/loadavg
View File

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

2
package/gluon-alfred/files/lib/gluon/alfred/announce.d/statistics/uptime
View File

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

6
package/gluon-autoupdater/files/lib/gluon/alfred/announce.d/software/autoupdater
View File

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

2
package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/software/batman-adv
View File

@ -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 } return { version = version }

6
package/gluon-mesh-batman-adv/files/lib/gluon/alfred/announce.d/statistics/traffic
View File

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

8
package/gluon-mesh-vpn-fastd/files/lib/gluon/alfred/announce.d/software/fastd
View File

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

6
package/gluon-node-info/files/lib/gluon/alfred/announce.d/location
View File

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