Use -n instead of ! -z

1 files changed, 17 insertions, 17 deletions

diff --git a/include/profiles b/include/profiles
index ad5e6b07..e27c84cd 100644
--- a/include/profiles
+++ b/include/profiles
@@ -77,7 +77,7 @@
                 # Is Lynis Enterprise allowed to purge this system when it is becomes outdated?
                 allow-auto-purge)
                     FIND=$(echo "${VALUE}" | egrep "^(1|true|yes)$")
-                    if [ ! -z "${FIND}" ]; then
+                    if [ -n "${FIND}" ]; then
                         Report "allow-auto-purge=1"
                     else
                         Report "allow-auto-purge=0"
@@ -110,7 +110,7 @@
                     # Quick mode (SKIP_PLUGINS) might already be set outside profile, so store in different variable
                     SETTING_COLORS=1 # default is yes
                     FIND=$(echo "${VALUE}" | egrep "^(0|false|no)$") && COLORS=0
-                    if [ ! -z "${FIND}" ]; then SETTING_COLORS=0; RemoveColors; fi
+                    if [ -n "${FIND}" ]; then SETTING_COLORS=0; RemoveColors; fi
                     Debug "Colors set to ${SETTING_COLORS}"
                     AddSetting "colors" "${SETTING_COLORS}" "Colored screen output"
                     unset SETTING_COLORS
@@ -204,7 +204,7 @@
                 ;;
 
                 hostalias | host-alias)
-                    if [ ! -z "${VALUE}" ]; then Report "hostname_alias=${VALUE}"; fi
+                    if [ -n "${VALUE}" ]; then Report "hostname_alias=${VALUE}"; fi
                 ;;
 
                 hostid)
@@ -223,13 +223,13 @@
                 # Language
                 language | lang)
                     LogText "Language set via profile to '${VALUE}'"
-                    if [ ! -z "${VALUE}" ]; then LANGUAGE="${VALUE}"; fi
+                    if [ -n "${VALUE}" ]; then LANGUAGE="${VALUE}"; fi
                     AddSetting "language" "${LANGUAGE}" "Language"
                 ;;
 
                 # Lynis Enterprise license key
                 license-key | license_key)
-                    if [ ! -z "${VALUE}" ]; then
+                    if [ -n "${VALUE}" ]; then
                         LICENSE_KEY="${VALUE}"
                         Report "license_key=${VALUE}"
                     fi
@@ -291,7 +291,7 @@
                     # Quick mode might already be set outside profile, so store in different variable
                     SETTING_QUICK_MODE=1 # default is yes
                     FIND=$(echo "${VALUE}" | egrep "^(0|false|no)$") && QUICKMODE=0
-                    if [ ! -z "${FIND}" ]; then SETTING_QUICK_MODE=1; fi
+                    if [ -n "${FIND}" ]; then SETTING_QUICK_MODE=1; fi
                     Debug "Quickmode set to ${SETTING_QUICK_MODE}"
                     AddSetting "quick" "${SETTING_QUICK_MODE}" "Quick mode (non-interactive)"
                 ;;
@@ -300,7 +300,7 @@
                 refresh-repositories)
                     SETTING_REFRESH_REPOSITORIES=1 # default is yes
                     FIND=$(echo "${VALUE}" | egrep "^(0|false|no)$") && REFRESH_REPOSITORIES=0
-                    if [ ! -z "${FIND}" ]; then SETTING_REFRESH_REPOSITORIES=0; fi
+                    if [ -n "${FIND}" ]; then SETTING_REFRESH_REPOSITORIES=0; fi
                     Debug "Refreshing repositories set to ${SETTING_REFRESH_REPOSITORIES}"
                     AddSetting "refresh-repositories" "${SETTING_REFRESH_REPOSITORIES}" "Refresh repositories (for vulnerable package detection)"
                 ;;
@@ -309,7 +309,7 @@
                 show-report-solution)
                     SETTING_SHOW_REPORT_SOLUTION=${SHOW_REPORT_SOLUTION}
                     FIND=$(echo "${VALUE}" | egrep "^(0|false|no)$") && SHOW_REPORT_SOLUTION=0
-                    if [ ! -z "${FIND}" ]; then SETTING_SHOW_REPORT_SOLUTION=0; fi
+                    if [ -n "${FIND}" ]; then SETTING_SHOW_REPORT_SOLUTION=0; fi
                     Debug "Show report details (solution) set to ${SETTING_SHOW_REPORT_SOLUTION}"
                 ;;
 
@@ -317,7 +317,7 @@
                 show_tool_tips | show-tool-tips)
                     SETTING_SHOW_TOOL_TIPS=1 # default is yes
                     FIND=$(echo "${VALUE}" | egrep "^(0|false|no)$") && SHOW_TOOL_TIPS=0
-                    if [ ! -z "${FIND}" ]; then SETTING_SHOW_TOOL_TIPS=0; fi
+                    if [ -n "${FIND}" ]; then SETTING_SHOW_TOOL_TIPS=0; fi
                     Debug "Show tool tips set to ${SETTING_SHOW_TOOL_TIPS}"
                     AddSetting "show-tool-tips" "${SETTING_SHOW_TOOL_TIPS}" "Show tool tips"
                 ;;
@@ -336,7 +336,7 @@
                     # Skip plugins (SKIP_PLUGINS) might already be set, so store in different variable
                     SETTING_SKIP_PLUGINS=0 # default is no
                     FIND=$(echo "${VALUE}" | egrep "^(1|true|yes)$") && SKIP_PLUGINS=1
-                    if [ ! -z "${FIND}" ]; then SETTING_SKIP_PLUGINS=1; fi
+                    if [ -n "${FIND}" ]; then SETTING_SKIP_PLUGINS=1; fi
                     Debug "Skip plugins is set to ${SETTING_SKIP_PLUGINS}"
                     AddSetting "skip-plugins" "${SETTING_SKIP_PLUGINS}" "Skip plugins"
                 ;;
@@ -374,17 +374,17 @@
 
                 # The name of the customer/client that uses this system
                 system-customer-name)
-                    if [ ! -z "${VALUE}" ]; then Report "system-customer-name=${VALUE}"; fi
+                    if [ -n "${VALUE}" ]; then Report "system-customer-name=${VALUE}"; fi
                 ;;
 
                 # The groups linked to a system (system-groups=customers,webservers,production)
                 system-groups)
-                    if [ ! -z "${VALUE}" ]; then Report "system-groups=${VALUE}"; fi
+                    if [ -n "${VALUE}" ]; then Report "system-groups=${VALUE}"; fi
                 ;;
 
                 # Tags (tags=db,production,ssn-1304)
                 tags)
-                    if [ ! -z "${VALUE}" ]; then Report "tags=${VALUE}"; fi
+                    if [ -n "${VALUE}" ]; then Report "tags=${VALUE}"; fi
                 ;;
 
                 # Define what kind of scan we are performing
@@ -399,7 +399,7 @@
                 upload)
                     SETTING_UPLOAD=no # default
                     FIND=$(echo "${VALUE}" | egrep "^(1|true|yes)$") && UPLOAD_DATA=1
-                    if [ ! -z "${FIND}" ]; then SETTING_UPLOAD=1; fi
+                    if [ -n "${FIND}" ]; then SETTING_UPLOAD=1; fi
                     Debug "Upload set to ${SETTING_UPLOAD}"
                     AddSetting "upload" "${SETTING_UPLOAD}" "Data upload after scanning"
                     unset SETTING_UPLOAD
@@ -499,12 +499,12 @@
 #################################################################################
 #
     SKIP_TESTS=$(echo ${SKIP_TESTS} | sed "s/^ //")
-    if [ ! -z "${SKIP_TESTS}" ]; then LogText "Skip tests: ${SKIP_TESTS}"; fi
+    if [ -n "${SKIP_TESTS}" ]; then LogText "Skip tests: ${SKIP_TESTS}"; fi
 #
 #################################################################################
 #
     # Add group name to report - deprecated
-    if [ ! -z "${GROUP_NAME}" ]; then Report "group=${GROUP_NAME}"; fi
+    if [ -n "${GROUP_NAME}" ]; then Report "group=${GROUP_NAME}"; fi
 #
 #################################################################################
 #
@@ -531,7 +531,7 @@
 #
 #################################################################################
 #
-    if [ ! -z "${DEPRECATED_OPTION}" ]; then
+    if [ -n "${DEPRECATED_OPTION}" ]; then
         ReportWarning "LYNIS" "One or more deprecated options used" "${DEPRECATED_OPTION}" "Update your profile"
     fi
 #