From: Luke Bonham Date: Tue, 24 Jan 2017 15:24:23 +0000 (+0100) Subject: Merge pull request #282 from 2009/patch-1 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/e0d4a89435d68714c0cee849625e0b14edca3d1c?ds=inline;hp=-c Merge pull request #282 from 2009/patch-1 Fix bug where net widget would not get the device name --- e0d4a89435d68714c0cee849625e0b14edca3d1c diff --combined widgets/net.lua index bc9ad0c,2457748..922e5e1 --- a/widgets/net.lua +++ b/widgets/net.lua @@@ -12,7 -12,6 +12,7 @@@ local naughty = require("naughty" local wibox = require("wibox") local string = { format = string.format, match = string.match } +local tostring = tostring local setmetatable = setmetatable -- Network infos @@@ -32,12 -31,11 +32,12 @@@ local function worker(args local settings = args.settings or function() end -- Compatibility with old API where iface was a string corresponding to 1 interface - net.iface = (args.iface and type(args.iface) == "string" and {args.iface}) or {} + net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or (type(args.iface) == "table" and args.iface)) or {} + function net.get_device() helpers.async(string.format("ip link show", device_cmd), function(ws) - ws = ws:match("(%w+): ") + ws = ws:match("(%w+): ") net.iface = ws and { ws } or {} end) end @@@ -118,7 -116,7 +118,7 @@@ settings() end - helpers.newtimer(net.iface, timeout, update) + helpers.newtimer("net-" .. tostring(net.iface), timeout, update) return net end