From: copycat-killer <dada@archlinux.info>
Date: Sun, 3 Jan 2016 10:36:06 +0000 (+0100)
Subject: clean failed rebase and repatch #160 2
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/e6a4db72f5b0a91a82653151886617528346e9eb?hp=c1bbfdac79bf6a61fbf3cecb8b00f7c4a1b606a7

clean failed rebase and repatch #160 2
---

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 7d8f9d3..1730494 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -97,18 +97,15 @@ local function worker(args)
 
             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 = first_line(bstr .. "/capacity") or (rem / tot) * 100
 
+            local perc = (rem / tot) * 100
             if perc <= 100 then
-               bat_now.perc = string.format("%d", perc)
+                bat_now.perc = string.format("%d", perc)
             elseif perc > 100 then
-               bat_now.perc = "100"
+                bat_now.perc = "100"
             elseif perc < 0 then
-               bat_now.perc = "0"
+                bat_now.perc = "0"
             end
 
             if rate ~= nil and ratev ~= nil then