Merge pull request #161 from aajjbb/batwidget-percentage-fix2

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 60bd71cd581c56965621b7fbc43c4366ead168b9..aa0ce6152b7c443ef874e6a8874e5c43e74a9a0e 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -96,21 +96,17 @@ local function worker(args)
             if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
-                       
-                       local perc = tonumber(first_line(bstr .. "/capacity"))                  
 
-            if not perc then
-                          perc = (rem / tot) * 100
-                       end
-                       
+            local perc = tonumber(first_line(bstr .. "/capacity")) or (rem / tot) * 100
+
                        if perc <= 100 then
-                          bat_now.perc = string.format("%d", perc)
-                       elseif perc > 100 then
-                          bat_now.perc = "100"
-                       elseif perc < 0 then
-                          bat_now.perc = "0"
-                       end
-               
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
+
             if rate ~= nil and ratev ~= nil then
                 bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
             else