From 9e4e98889e3af899a6175d494fc20f6623d2326b Mon Sep 17 00:00:00 2001
From: koksnuss <koksnuss@arcor.de>
Date: Thu, 7 Jun 2018 08:30:25 +0200
Subject: [PATCH] enhance ip module: bufgixes and wording

---
 modules/ip | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/modules/ip b/modules/ip
index 24d250e..e6c3958 100755
--- a/modules/ip
+++ b/modules/ip
@@ -1,25 +1,13 @@
 #!/bin/bash
 
-# kurzinformation:
-# ist ein Netzwerkadapter vorhanden?
-    # JA
-    # ist eine netzwerkverbindung vorhanden?
-        # JA
-        # ist eine Internetverbindung vorhanden?
-            # JA
-            # *up/down* *interface: Internet IP-ADRESSE, up/down* green
-            # NEIN
-            # *up/down* *interface: Intranet IP-ADRESSE, up/down* orange
-        # NEIN
-        # *off* *interface: off*
-    # NEIN
-    # *n/a* *network interface not available*
-
 # start firefox
 [[ "$BLOCK_BUTTON" == 3 ]] && firefox
 
 # get LONG status
-[[ "$BLOCK_BUTTON" == 1 || "$BLOCK_INSTANCE" =~ "long" ]] && LONG=true || LONG=false
+if [[ "$BLOCK_BUTTON" == 1 ]]; then
+    [[ "$LONG" = true ]] && LONG=false || LONG=true
+fi
+[[ "$BLOCK_INSTANCE" =~ "long" ]] && LONG=true
 
 # get interface
 if [[ -n "$BLOCK_INSTANCE" ]]; then
@@ -28,9 +16,15 @@ else
     IF=$(ip route | awk '/^default/ { print $5 ; exit }')
 fi
 
-# check if network interface is available
-if [[ "$IF" == "" || ! -d "/sys/class/net/$IF" ]]; then
-    [[ "$LONG" ]] && echo "No network" || echo "n/a"
+# check if network interface is empty
+if [[ -z "$IF" ]]; then
+    [[ "$LONG" = true ]] && echo "No interface" || echo "n/a"
+    exit 33
+fi
+
+# check if the network interface exists
+if [[ ! -d "/sys/class/net/$IF" ]]; then
+    [[ "$LONG" = true ]] && echo "No interface" || echo "n/a"
     exit 33
 fi
 
@@ -46,11 +40,19 @@ if [[ "$LAN" =~ " UP " ]]; then
         WAN_IP=$(curl -s checkip.dyndns.org | sed -e 's/.*Current IP Address: //' -e 's/<.*$//')
         # check if internet connection is established
         if [[ "$?" -eq 0 && $WAN_IP != "" ]]; then
-            [[ $LONG ]] && echo $WAN_IP || echo up
+            if [[ "$LONG" = true ]]; then
+                echo $WAN_IP
+                echo $WAN_IP
+                echo "#04B431"
+            else
+                echo wan
+                echo wan
+                echo "#04B431"
+            fi
         else
             echo "lan"
         fi
     fi
 else
-    [[ "$LONG" ]] && echo "$IF: off\noff\n\n" || echo "off\noff\n\n"
+    [[ "$LONG" = true ]] && echo "$IF: off" || echo "off"
 fi