Fix regression in net.lua widget

[etc/awesome.git] / widgets / net.lua

diff --git a/widgets/net.lua b/widgets/net.lua
index 83ac6bf7791bba27ca30760d5f50f1c697aff0ad..e8583e0fb3abdcaea93ce9d499cc6bb9e6aaf732 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -10,12 +10,8 @@
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 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 string       = { format = string.format,
                        match  = string.match }

-

 local setmetatable = setmetatable
 
 -- Network infos
 local setmetatable = setmetatable
 
 -- Network infos


@@ -35,10 +31,11 @@ local function worker(args)
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface
     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()
 
     function net.get_device()

-        helpers.async(string.format("%s -c 'ip link show'", shell, device_cmd), function(ws)
+        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)
             ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
             net.iface = ws and { ws } or {}
         end)