quake: updated spawn call

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

diff --git a/widgets/net.lua b/widgets/net.lua
index 4dbacf5715cada88ba58b0228a4b4f15b2be34fe..f0b37700eab1e1ea16cb0a69a3ffd46053325af0 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -21,10 +21,13 @@ local setmetatable = setmetatable
 -- lain.widgets.net
 
 local function worker(args)
 -- lain.widgets.net
 
 local function worker(args)

-    local net = { last_t = 0, last_r = 0, devices = {} }
+    local net = helpers.make_widget_textbox()
+    net.last_t = 0
+    net.last_r = 0
+    net.devices = {}

 
     function net.get_first_device()
 
     function net.get_first_device()

-        local ws = helpers.read_pipe("/usr/sbin/ip link show | cut -d' ' -f2,9")
+        local ws = helpers.read_pipe("ip link show | cut -d' ' -f2,9")

         ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
         if ws then return { ws:match("(%w+):") }
         else return {} end
         ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
         if ws then return { ws:match("(%w+):") }
         else return {} end


@@ -38,8 +41,6 @@ local function worker(args)
     local settings = args.settings or function() end
     local iface    = args.iface or net.get_first_device()
 
     local settings = args.settings or function() end
     local iface    = args.iface or net.get_first_device()
 

-    net.widget = wibox.widget.textbox('')
-

     -- Compatibility with old API where iface was a string corresponding to 1 interface
     if type(iface) == "string" then
         iftable = {iface}
     -- Compatibility with old API where iface was a string corresponding to 1 interface
     if type(iface) == "string" then
         iftable = {iface}


@@ -138,7 +139,7 @@ local function worker(args)
 
     helpers.newtimer(iface, timeout, update)
 
 
     helpers.newtimer(iface, timeout, update)
 

-    return setmetatable(net, { __index = net.widget })
+    return net

 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })