From fa8bad20db100d95cf089b0b2d897c339327215c Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 16 Jul 2019 13:20:30 +0200
Subject: Use -n instead of ! -z

---
 lynis | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lynis')

diff --git a/lynis b/lynis
index 8476efe0..35a023ef 100755
--- a/lynis
+++ b/lynis
@@ -538,8 +538,8 @@ ${NORMAL}
     Report "os_fullname=${OS_FULLNAME}"
     Report "os_version=${OS_VERSION}"
     if [ "${OS}" = "Linux" ]; then Report "linux_version=${LINUX_VERSION}"; fi
-    if [ ! -z "${OS_KERNELVERSION}" ]; then Report "os_kernel_version=${OS_KERNELVERSION}"; fi
-    if [ ! -z "${OS_KERNELVERSION_FULL}" ]; then Report "os_kernel_version_full=${OS_KERNELVERSION_FULL}"; fi
+    if [ -n "${OS_KERNELVERSION}" ]; then Report "os_kernel_version=${OS_KERNELVERSION}"; fi
+    if [ -n "${OS_KERNELVERSION_FULL}" ]; then Report "os_kernel_version_full=${OS_KERNELVERSION_FULL}"; fi
 
     Report "hostname=${HOSTNAME}"
 
@@ -635,7 +635,7 @@ ${NORMAL}
             LogText "Note: the end-of-life of '${OS_FULLNAME}' could not be checked. Entry missing in software-eol.db?"
         fi
 
-        if [ ! -z "${OS_MODE}" ]; then echo "  Operating system mode:     ${OS_MODE}"; fi
+        if [ -n "${OS_MODE}" ]; then echo "  Operating system mode:     ${OS_MODE}"; fi
         echo "  Kernel version:            ${OS_KERNELVERSION}"
         echo "  Hardware platform:         ${HARDWARE}"
         echo "  Hostname:                  ${HOSTNAME}"
@@ -658,9 +658,9 @@ ${NORMAL}
     LogText "Operating system:          ${OS}"
     LogText "Operating system name:     ${OS_NAME}"
     LogText "Operating system version:  ${OS_VERSION}"
-    if [ ! -z "${OS_MODE}" ]; then LogText "Operating system mode:     ${OS_MODE}"; fi
+    if [ -n "${OS_MODE}" ]; then LogText "Operating system mode:     ${OS_MODE}"; fi
     LogText "Kernel version:            ${OS_KERNELVERSION}"
-    if [ ! -z "${OS_KERNELVERSION_FULL}" ]; then
+    if [ -n "${OS_KERNELVERSION_FULL}" ]; then
         LogText "Kernel version (full):     ${OS_KERNELVERSION_FULL}"
     fi
     LogText "Hardware platform:         ${HARDWARE}"
@@ -872,7 +872,7 @@ ${NORMAL}
                         for PROFILE in ${PROFILES}; do
                             LogText "Action: checking plugin status in profile: ${PROFILE}"
                             FIND3=$(grep "^plugin=${FIND2}" ${PROFILE})
-                            if [ ! -z "${FIND3}" ]; then
+                            if [ -n "${FIND3}" ]; then
                                 FOUND=0
                                 for I in ${DISABLED_PLUGINS}; do
                                     if [ "${I}" = "${FIND2}" ]; then
-- 
cgit v1.2.3