X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cce5b6fe11fe8c69b08140d645c604fef59e42a..56ebe9158e0de45c56e789d626fad927cc5e75a5:/widgets/net.lua

diff --git a/widgets/net.lua b/widgets/net.lua
index ff16075..223f3af 100644
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -10,7 +10,6 @@
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-local shell        = require("awful.util").shell
 local string       = { format = string.format,
                        match  = string.match }
 local setmetatable = setmetatable
@@ -19,7 +18,7 @@ local setmetatable = setmetatable
 -- lain.widgets.net
 
 local function worker(args)
-    local net = helpers.make_widget_textbox()
+    local net = { widget = wibox.widget.textbox() }
     net.last_t = 0
     net.last_r = 0
     net.devices = {}
@@ -32,11 +31,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("%s -c 'ip link show'", shell, device_cmd), function(ws)
-            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+        helpers.async(string.format("ip link show", device_cmd), function(ws)
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-UP,LOWER_UP>")
             net.iface = ws and { ws } or {}
         end)
     end
@@ -97,12 +97,10 @@ local function worker(args)
                 helpers.set_map(dev, true)
             end
 
-            -- Old api compatibility
             net_now.carrier      = dev_now.carrier
             net_now.state        = dev_now.state
-            -- And new api
             net_now.devices[dev] = dev_now
-            -- With the new api new_now.sent and net_now.received will be the
+            -- new_now.sent and net_now.received will be the
             -- totals across all specified devices
         end
 
@@ -117,7 +115,7 @@ local function worker(args)
         settings()
     end
 
-    helpers.newtimer(net.iface, timeout, update)
+    helpers.newtimer("network", timeout, update)
 
     return net
 end