From 98017c78cac83d3370861797a3d2f716e8948481 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 17 Sep 2019 14:04:30 +0200
Subject: Implemented several code style improvements

---
 lynis | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lynis')

diff --git a/lynis b/lynis
index 32372a37..dcc7de05 100755
--- a/lynis
+++ b/lynis
@@ -198,7 +198,7 @@
         fi
         printf "\n\n[ Press ENTER to continue, or CTRL+C to cancel ]"
         IGNORE_FILE_PERMISSION_ISSUES=1
-        read DUMMY
+        read -r void
     fi
 
     # Now include files if permissions are correct, or user decided to continue
@@ -727,7 +727,7 @@ ${NORMAL}
         LogText "Latest stable version      : ${PROGRAM_LV}"
         if [ ${PROGRAM_LV} -gt ${PROGRAM_AC} ]; then
             # Check if current version is REALLY outdated (10 versions ago)
-            PROGRAM_MINVERSION=$((${PROGRAM_LV} - 10))
+            PROGRAM_MINVERSION=$((PROGRAM_LV - 10))
             LogText "Minimum required version   : ${PROGRAM_MINVERSION}"
             if [ ${PROGRAM_MINVERSION} -gt ${PROGRAM_AC} ]; then
                 Display --indent 2 --text "- Program update status... " --result "WARNING" --color RED
@@ -764,7 +764,7 @@ ${NORMAL}
 
     OLD_RELEASE=0
     TIME_DIFFERENCE_CHECK=10368000 # 4 months
-    RELEASE_PLUS_TIMEDIFF=$((${PROGRAM_RELEASE_TIMESTAMP} + ${TIME_DIFFERENCE_CHECK}))
+    RELEASE_PLUS_TIMEDIFF=$((PROGRAM_RELEASE_TIMESTAMP + TIME_DIFFERENCE_CHECK))
     if [ ${NOW} -gt ${RELEASE_PLUS_TIMEDIFF} ]; then
         # Show if release is old, only if we didn't show it with normal update check
         if [ ${UPDATE_AVAILABLE} -eq 0 ]; then
@@ -882,7 +882,7 @@ ${NORMAL}
                 if [ -f ${PLUGIN_FILE} ]; then
                     FIND2=$(grep "^# PLUGIN_NAME=" ${PLUGIN_FILE} | awk -F= '{ print $2 }')
                     if [ ! "${FIND2}" = "" -a ! "${FIND2}" = "[plugin_name]" ]; then
-                        if [ ${PLUGIN_PHASE} -eq 1 ]; then N_PLUGIN=$((${N_PLUGIN} + 1)); fi
+                        if [ ${PLUGIN_PHASE} -eq 1 ]; then N_PLUGIN=$((N_PLUGIN + 1)); fi
                         # Check if the plugin is enabled in any of the profiles
                         PLUGIN_ENABLED_STATE=0
                         for PROFILE in ${PROFILES}; do
@@ -911,7 +911,7 @@ ${NORMAL}
                                 if SafePerms ${PLUGINFILE}; then
                                     LogText "Including plugin file: ${PLUGINFILE} (version: ${PLUGIN_VERSION})"
                                     Report "plugin_enabled_phase${PLUGIN_PHASE}[]=${FIND2}|${PLUGIN_VERSION}|"
-                                    if [ ${PLUGIN_PHASE} -eq 1 ]; then N_PLUGIN_ENABLED=$((${N_PLUGIN_ENABLED} + 1)); fi
+                                    if [ ${PLUGIN_PHASE} -eq 1 ]; then N_PLUGIN_ENABLED=$((N_PLUGIN_ENABLED + 1)); fi
                                     Display --indent 2 --text "- ${CYAN}Plugin${NORMAL}: ${WHITE}${FIND2}${NORMAL}"
                                     if [ ${PLUGIN_PHASE} -eq 1 ]; then Progress "    ["; fi
                                     . ${PLUGINFILE}
-- 
cgit v1.2.3