X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f5eac3a48ed6de9b1fd6d58f97465a6a31654566..bfa2615942951cb2f9de04aba4742efef3ba7423:/widgets/net.lua

diff --git a/widgets/net.lua b/widgets/net.lua
index 08c7366..84751b6 100644
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,7 +13,7 @@ local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { popen  = io.popen }
 local tostring     = tostring
 local string       = { format = string.format,
                        gsub   = string.gsub }
@@ -29,11 +29,11 @@ local net = {
 
 function net.get_device()
     f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*all")
+    ws = f:read("*a")
     f:close()
-    ws = ws:match("%w+: UP")
+    ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
     if ws ~= nil then
-        return ws:gsub(": UP", "")
+        return ws:match("(%w+):")
     else
         return "network off"
     end
@@ -45,6 +45,7 @@ local function worker(args)
     local iface = args.iface or net.get_device()
     local units = args.units or 1024 --kb
     local notify = args.notify or "on"
+    local screen = args.screen or 1
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')
@@ -87,7 +88,8 @@ local function worker(args)
                     timeout  = 7,
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
-                    fg       = notify_fg or "#FFFFFF"
+                    fg       = notify_fg or "#FFFFFF",
+                    screen   = screen
                 })
                 helpers.set_map(iface, false)
             end