Use -n instead of ! -z

1 files changed, 17 insertions, 17 deletions

diff --git a/include/tests_networking b/include/tests_networking
index 8c895c4e..23067c57 100644
--- a/include/tests_networking
+++ b/include/tests_networking
@@ -47,7 +47,7 @@
         IPV6_MISCONFIGURED=0
         IPV6_MISCONFIGURED_MTU=0
         FIND=$(sysctl -a 2> /dev/null | ${GREPBINARY} "^net.ipv6" | ${SEDBINARY} "s/ = /=/")
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             IPV6_CONFIGURED=1
             for I in ${FIND}; do
                 SYSCTL_KEY=$(echo ${I} | ${AWKBINARY} -F= '{ print $1 }')
@@ -124,7 +124,7 @@
         if [ -f /etc/resolv.conf ]; then
             LogText "Result: Found /etc/resolv.conf file"
             FIND=$(${GREPBINARY} '^nameserver' /etc/resolv.conf | ${TRBINARY} -d '\t' | ${SEDBINARY} 's/nameserver*//g' | uniq | ${CUTBINARY} -d# -f1)
-            if [ ! -z "${FIND}" ]; then
+            if [ -n "${FIND}" ]; then
                 Display --indent 4 --text "- Testing nameservers"
                 LogText "Test: Querying nameservers"
                 for I in ${FIND}; do
@@ -134,7 +134,7 @@
                     if [ "${I}" = "::1" -o "${I}" = "127.0.0.1" -o "${I}" = "127.0.0.53" -o "${I}" = "127.0.1.1" -o "${I}" = "0.0.0.0" ]; then
                         LOCAL_DNSRESOLVER_FOUND=1
                     fi
-                    if [ ! -z "${DIGBINARY}" ]; then
+                    if [ -n "${DIGBINARY}" ]; then
                         # See if we can query something at the nameserver
                         # 0=good, other=bad
                         DNSRESPONSE=$(${DIGBINARY} +noall +time=3 +retry=0 @${I} ${FQDN} > /dev/null ; echo $?)
@@ -167,7 +167,7 @@
     Register --test-no NETW-2705 --preqs-met ${PREQS_MET} --weight L --network YES --category security --description "Check availability two nameservers"
     if [ ${SKIPTEST} -eq 0 ]; then
         SKIP=0
-        if [ ! -z "${DIGBINARY}" ]; then
+        if [ -n "${DIGBINARY}" ]; then
             if [ ${NUMBERACTIVENS} -lt 2 ]; then
                 Display --indent 4 --text "- Minimal of 2 responsive nameservers" --result "${STATUS_WARNING}" --color RED
                 LogText "Result: less than 2 responsive nameservers found"
@@ -193,12 +193,12 @@
     # Test        : NETW-3001
     # Description : Find default gateway (route)
     # More info   : BSD: ^default   Linux: 0.0.0.0
-    if [ ! -z "${NETSTATBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
+    if [ -n "${NETSTATBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no NETW-3001 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Find default gateway (route)"
     if [ $SKIPTEST -eq 0 ]; then
         LogText "Test: Searching default gateway(s)"
         FIND=$(${NETSTATBINARY} -rn | ${EGREPBINARY} "^0.0.0.0|default" | ${TRBINARY} -s ' ' | ${CUTBINARY} -d ' ' -f2)
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             for I in ${FIND}; do
                 LogText "Result: Found default gateway ${I}"
                 Report "default_gateway[]=${I}"
@@ -222,9 +222,9 @@
                 FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${GREPBINARY} "flags=" | ${AWKBINARY} -F ":" '{ print  $1 }')
             ;;
             Linux)
-                if [ ! -z "${IPBINARY}" ]; then
+                if [ -n "${IPBINARY}" ]; then
                     FIND=$(${IPBINARY} link show 2> /dev/null | ${GREPBINARY} "^[0-9]" | ${AWKBINARY} '{ print $2 }' | ${SEDBINARY} 's/://g')
-                elif [ ! -z "${IFCONFIGBINARY}" ]; then
+                elif [ -n "${IFCONFIGBINARY}" ]; then
                     FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ( $2 == "Link" ) { print  $1 }}')
                 fi
             ;;
@@ -265,14 +265,14 @@
                 FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ($1=="ether") print $2 }' | ${SORTBINARY} -u)
                 ;;
             Linux)
-                if [ ! -z "${IFCONFIGBINARY}" ]; then
+                if [ -n "${IFCONFIGBINARY}" ]; then
                     FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${GREPBINARY} "HWaddr" | ${AWKBINARY} '{ if ($4=="HWaddr") print $5 }' | ${SORTBINARY} -u)
                     # CentOS 7.x and others may return nothing. Let's retry with 'ether' field.
                     if [ -z "${FIND}" ]; then
                         FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ($1=="ether") print $2 }' | ${SORTBINARY} -u)
                     fi
                 else
-                    if [ ! -z "${IPBINARY}" ]; then
+                    if [ -n "${IPBINARY}" ]; then
                         LogText "Test: Using ip binary to gather hardware addresses"
                         FIND=$(${IPBINARY} link 2> /dev/null | ${GREPBINARY} "link/ether" | ${AWKBINARY} '{ print $2 }')
                     else
@@ -320,12 +320,12 @@
                 FIND2=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ($1=="inet6") print $2 }')
                 ;;
             Linux)
-                if [ ! -z "${IFCONFIGBINARY}" ]; then
+                if [ -n "${IFCONFIGBINARY}" ]; then
                     FIND=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ($1=="inet") print $2 }' | ${CUTBINARY} -d ':' -f2)
                     # Version which works for multiple types of ifconfig (e.g. Slackware)
                     FIND2=$(${IFCONFIGBINARY} -a 2> /dev/null | ${AWKBINARY} '{ if ($1=="inet6" && $2=="addr:") { print $3 } else { if ($1=="inet6" && $3=="prefixlen") { print $2 } } }')
                 else
-                    if [ ! -z "${IPBINARY}" ]; then
+                    if [ -n "${IPBINARY}" ]; then
                         LogText "Test: Using ip binary to gather IP addresses"
                         FIND=$(${IPBINARY} addr 2> /dev/null | ${AWKBINARY} '{ if ($1=="inet") { print $2 }}' | ${SEDBINARY} 's/\/.*//')
                         FIND2=$(${IPBINARY} addr 2> /dev/null | ${AWKBINARY} '{ if ($1=="inet6") { print $2 }}' | ${SEDBINARY} 's/\/.*//')
@@ -375,7 +375,7 @@
         COUNT=0
         case ${OS} in
             DragonFly|FreeBSD)
-                if [ ! -z "${SOCKSTATBINARY}" ]; then
+                if [ -n "${SOCKSTATBINARY}" ]; then
                     FIND=$(${SOCKSTATBINARY} | ${AWKBINARY} '{ if ($7 ~ /\*:\*/) print $5"|"$6"|"$2"|" }' | ${SORTBINARY} -u)
                     # To strip off IP's: ${SEDBINARY} 's/|.*:/|/'
                 else
@@ -513,17 +513,17 @@
         NETWORK=""
         USE_IP_INSTEAD_IFCONFIG=0
 
-        if [ ! -z "${IPBINARY}" ]; then
+        if [ -n "${IPBINARY}" ]; then
             LogText "Test: Using ip binary to retrieve network interfaces"
             NETWORK=$(${IPBINARY} -o link 2> /dev/null | ${GREPBINARY} "^[0-9]" | ${AWKBINARY} '{print $2 }' | ${TRBINARY} -d ':')
             USE_IP_INSTEAD_IFCONFIG=1
-        elif [ ! -z "${IFCONFIGBINARY}" ]; then
+        elif [ -n "${IFCONFIGBINARY}" ]; then
             LogText "Test: Using ifconfig binary to retrieve network interfaces"
             NETWORK=$(${IFCONFIGBINARY} 2> /dev/null | ${GREPBINARY} Link | ${TRBINARY} -s ' ' | ${CUTBINARY} -d ' ' -f1)
         fi
 
         LogText "Test: Checking all interfaces to discover any with promiscuous mode enabled"
-        if [ ! -z "${NETWORK}" ]; then
+        if [ -n "${NETWORK}" ]; then
             FOUNDPROMISC=0
             for I in ${NETWORK}; do
                 if [ ${USE_IP_INSTEAD_IFCONFIG} -eq 1 ]; then
@@ -531,7 +531,7 @@
                 else
                     FIND=$(${IFCONFIGBINARY} ${I} 2> /dev/null | ${GREPBINARY} PROMISC)
                 fi
-                if [ ! -z "${FIND}" ]; then
+                if [ -n "${FIND}" ]; then
                     LogText "Result: Promiscuous interface: ${I}"
                     ISWHITELISTED=$(${GREPBINARY} "^if_promisc:${I}:" ${PROFILE})
                     if [ -z "${ISWHITELISTED}" ]; then