do not add `us' as secondary if already present

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 198b6f71c124c0d141709f61e11bc1d5c3ac2f5c..2f377f78bb4ccd552bf01f5299476719f21e2d53 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -7,16 +7,17 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
+local read_pipe    = require("lain.helpers").read_pipe
+
 local wibox        = require("wibox")
 
-local io           = io
 local setmetatable = setmetatable
 
--- Basic template for custom widgets 
+-- Basic template for custom widgets
 -- lain.widgets.base
-local base = {}
 
 local function worker(args)
+    local base     = {}
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
@@ -25,16 +26,14 @@ local function worker(args)
     base.widget = wibox.widget.textbox('')
 
     function base.update()
-        local f = assert(io.popen(cmd))
-        output = f:read("*all")
-        f:close()
+        output = read_pipe(cmd)
         widget = base.widget
         settings()
     end
 
-    newtimer(cmd, timeout, update)
+    newtimer(cmd, timeout, base.update)
 
     return setmetatable(base, { __index = base.widget })
 end
 
-return setmetatable(base, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })