From 4d252538d9cad5b255d463443e5d1b3d49ac2254 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Sat, 4 May 2013 00:12:48 +0200
Subject: [PATCH] Awesome: fixed network plugin (loopback interface was
 breaking things). netinit: using 'iw' instead of 'iwconfig'.

---
 .config/awesome/rc.lua |  4 +++-
 .scripts/homeinit      | 13 +++++++------
 .scripts/netinit       |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 8ef1e8d4..35267479 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -127,12 +127,14 @@ if ostype == "Linux" then
 
    -- Net
    -- CHECK: not sure if args["{".. device .." carrier}"] may have values below 0. What do values of the args table mean?
-   local proc = io.popen("ls -1 /sys/class/net")
+   -- Note: we must make sure note to take the loopback interface into account.
+   local proc = io.popen("ls -1 /sys/class/net | grep -v '^lo$'")
    local ifarray = {}
    for line in proc:lines() do
       table.insert (ifarray, line);
    end
    proc:close()
+
    vicious.register(netwidget, vicious.widgets.net,
                     function (widget, args)
                        for _,device in pairs(ifarray) do
diff --git a/.scripts/homeinit b/.scripts/homeinit
index c32ad373..f0ab4a39 100755
--- a/.scripts/homeinit
+++ b/.scripts/homeinit
@@ -58,7 +58,7 @@ fi
 if [ -n "$(command -v dwb)" ]; then
     echo "==> dwb"
     dwbem -Ni adblock_subscriptions
-    dwbem -Ni youtube_html5
+    # dwbem -Ni youtube_html5
     echo
 fi
 
@@ -78,8 +78,9 @@ echo
 
 ## News
 if [ -n "$(command -v newsbeuter)" ]; then
-echo "==> Newsbeuter"
-mkdir -p "$XDG_DATA_HOME/newsbeuter"
-[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/urls" "$XDG_CONFIG_HOME/newsbeuter/"
-[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/news_starred" "$XDG_CONFIG_HOME/newsbeuter/"
-echo
+    echo "==> Newsbeuter"
+    mkdir -p "$XDG_DATA_HOME/newsbeuter"
+    [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/urls" "$XDG_CONFIG_HOME/newsbeuter/"
+    [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/news_starred" "$XDG_CONFIG_HOME/newsbeuter/"
+    echo
+fi
diff --git a/.scripts/netinit b/.scripts/netinit
index 85a4385d..9a6b172e 100755
--- a/.scripts/netinit
+++ b/.scripts/netinit
@@ -44,13 +44,13 @@ if [ "$OSTYPE" = "linux-gnu" ] ; then
     ip link set ${NET_INTERFACE} up
 
     # Associate if needed.
-    if [ "$1" = "-f" ] || [ -n "$(iwconfig ${NET_INTERFACE} | grep 'Not-Associated')" ]; then
+    if [ "$1" = "-f" ] || [ -z "$(iw dev ${NET_INTERFACE} link | grep SSID)" ]; then
         wpa_supplicant -B -i ${NET_INTERFACE} -D wext -c <(echo "${WPA_SUPPLICANT_CONF}")
     fi
 
     ## Wait until wpa_supplicant has finished association.
     i=0
-    while [ -n "$(iwconfig ${NET_INTERFACE} | grep 'off/any')" ] && [ $i -lt $TIMEOUT_LIMIT ] ; do
+    while [ -z "$(iw dev ${NET_INTERFACE} link | grep SSID)" ] && [ $i -lt $TIMEOUT_LIMIT ] ; do
         i=$(($i+1))
     done