clean failed rebase and repatch #160 2

This commit is contained in:
copycat-killer 2016-01-03 11:35:10 +01:00
parent 0f1fe46d18
commit e966fd310e
1 changed files with 11 additions and 14 deletions

View File

@ -97,12 +97,9 @@ 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)
elseif perc > 100 then