From: luke bonham <dadasignificanulla@gmail.com>
Date: Wed, 25 Sep 2013 14:36:19 +0000 (+0200)
Subject: bat: compatibility fix
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/3831b4b2d32845b889858ec499dbeb9d49e88967?ds=inline;hp=e95d34ccd81feb097940f634f51baa3540367dd2

bat: compatibility fix
---

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 7b14a9a..0bb5eff 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -38,27 +38,24 @@ local function worker(args)
             watt   = "N/A"
         }
 
-        local present = first_line("/sys/class/power_supply/"
-                                   .. battery
-                                   .. "/present")
+        local bstr  = "/sys/class/power_supply/" .. battery
+
+        local present = first_line(bstr .. "/present")
 
         if present == "1"
         then
-            local rate = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                    "/power_now")
-            local ratev = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                     "/voltage_now")
-            local rem = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/energy_now")
-            local tot = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/energy_full")
-            bat_now.status = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/status")
+            local rate  = first_line(bstr .. "/power_now") or
+                          first_line(bstr .. "/current_now")
+
+            local ratev = first_line(bstr .. "/voltage_now")
+
+            local rem   = first_line(bstr .. "/energy_now") or
+                          first_line(bstr .. "/charge_now")
+
+            local tot   = first_line(bstr .. "/energy_full") or
+                          first_line(bstr .. "/charge_full")
+
+            bat_now.status = first_line(bstr .. "/status") or "N/A"
 
             local time_rat = 0
             if bat_now.status == "Charging"
diff --git a/wiki b/wiki
index 91217d6..807599b 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 91217d6bad68401ee926ca79d3ef917525507321
+Subproject commit 807599b7446b4866a8a2030b9a0fb4fd4f9ce754