From 3d4dc46d3f39edacf3654ba00a666383a12d8375 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Wed, 31 Jan 2018 12:16:32 +0000
Subject: [i3blocks] Update wifi block

---
 i3/.config/i3blocks/bin/wifi | 16 ++++++++++++----
 i3/.config/i3blocks/config   |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'i3')

diff --git a/i3/.config/i3blocks/bin/wifi b/i3/.config/i3blocks/bin/wifi
index fd9a9c5..01ff021 100755
--- a/i3/.config/i3blocks/bin/wifi
+++ b/i3/.config/i3blocks/bin/wifi
@@ -1,7 +1,15 @@
 #!/usr/bin/env bash
 
-quality=$(iwconfig wlp2s0 | grep -oP 'Link Quality=\K[0-9]*/[0-9]*' | awk -F'/' '{print int(100*$1/$2)}')
-ssid=$(iwconfig wlp2s0 | grep -oP '(?<=ESSID:").*(?=")')
-address=$(ip addr show wlp2s0 | grep -oP -m1 "(?<=inet ).*(?=/)")
+quality=$(iwconfig wlp2s0 2>/dev/null | grep -oP 'Link Quality=\K[0-9]*/[0-9]*' | awk -F'/' '{print int(100*$1/$2)}')
+ssid=$(iwconfig wlp2s0 2>/dev/null | grep -oP '(?<=ESSID:").*(?=")')
+wifi_address=$(ip addr show wlp2s0 2>/dev/null | grep -oP -m1 "(?<=inet ).*(?=/)")
+eth_address=$(ip addr show eno1 2>/dev/null | grep -oP -m1 "(?<=inet ).*(?=/)")
+
+if [[ -n $eth_address ]]; then 
+    echo "eno1: $eth_address"
+elif [[ -n $wifi_address ]]; then
+    echo "wlp2s0: (${quality}% at ${ssid}) ${address}"
+else
+    echo "No connection"
+fi
 
-echo "(${quality}% at ${ssid}) ${address}"
diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config
index af4d658..2e149bf 100644
--- a/i3/.config/i3blocks/config
+++ b/i3/.config/i3blocks/config
@@ -39,13 +39,13 @@ label=♪
 instance=Master
 interval=5
 
-[email]
+[wifi]
 label=W:
 command=~/dotfiles/i3/.config/i3blocks/bin/wifi
 separator=true
 interval=5
 
-[wifi]
+[email]
 label=Mail:
 command=~/dotfiles/i3/.config/i3blocks/bin/email
 separator=true
-- 
cgit v1.2.3