Merge pull request #344 from 2009/patch-5

[etc/awesome.git] / widget / temp.lua

diff --git a/widget/temp.lua b/widget/temp.lua
index 8e3bc3c37e11b616dc8f2c2b3e1026b63e3e54f9..efe2ab931dd971af9f39b44889b07ed3b7003030 100644 (file)
--- a/widget/temp.lua
+++ b/widget/temp.lua
@@ -6,26 +6,23 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local helpers      = require("lain.helpers")
-local wibox        = require("wibox")
-local io           = { open = io.open }
-local tonumber     = tonumber
-local setmetatable = setmetatable
+local helpers  = require("lain.helpers")
+local wibox    = require("wibox")
+local open     = io.open
+local tonumber = tonumber

 
 -- coretemp
 -- lain.widget.temp
 
 -- coretemp
 -- lain.widget.temp

-local temp = {}

 
 local function factory(args)
 
 local function factory(args)

+    local temp     = { widget = wibox.widget.textbox() }

     local args     = args or {}
     local timeout  = args.timeout or 2
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 
     local args     = args or {}
     local timeout  = args.timeout or 2
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 

-    temp.widget = wibox.widget.textbox()
-

     function temp.update()
     function temp.update()

-        local f = io.open(tempfile)
+        local f = open(tempfile)

         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()


@@ -42,4 +39,4 @@ local function factory(args)
     return temp
 end
 
     return temp
 end
 

-return setmetatable(temp, { __call = function(_, ...) return factory(...) end })
+return factory