From df4d934eb8c77ccaad0b252561b32ce62e6e05b0 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Wed, 3 Dec 2014 22:43:53 +0100
Subject: [PATCH] Changed progress display on screen (of plugins)

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

diff --git a/lynis b/lynis
index 500f093e..dab8a3fe 100755
--- a/lynis
+++ b/lynis
@@ -579,7 +579,7 @@
             echo "        ${WHITE}Please update to the latest version for new features, bug fixes, tests"
             echo "        and baselines.${NORMAL}"
             echo ""
-            echo "        http://cisofy.com/downloads/"
+            echo "        https://cisofy.com/downloads/"
             echo ""
             echo "      ==============================================================================="
             echo ""
@@ -634,7 +634,7 @@
                 FIND3=`grep "^plugin=${FIND2}" ${PROFILE}`
                 if [ ! "${FIND3}" = "" ]; then
                     logtext "Plugin ${FIND2} is enabled"
-                    # Plugins should have at least a _post part, _pre is optional (future)
+                    # Plugins should have at least a _phase1 part, _phase2 is optional at this moment
                     PLUGINFILE="${PLUGINDIR}/plugin_${FIND2}_phase1"
                     if [ -f ${PLUGINFILE} ]; then
                         PLUGIN_VERSION=`grep "^# PLUGIN_VERSION=" ${I} | awk -F= '{ print $2 }'`
@@ -644,10 +644,12 @@
                             logtext "Including plugin file: ${PLUGINFILE} (version: ${PLUGIN_VERSION})"
                             report "plugin_enabled_phase1[]=${FIND2}|${PLUGIN_VERSION}|"
                             N_PLUGIN_ENABLED=`expr ${N_PLUGIN_ENABLED} + 1`
-                            #logtext "PLUGIN EXECUTION SKIPPED, STILL EXPERIMENTAL"
-                            Display --indent 2 --text "- ${CYAN}Plugin${NORMAL}: ${WHITE}${FIND2}${NORMAL}" --no-break
+                            Display --indent 2 --text "- ${CYAN}Plugin${NORMAL}: ${WHITE}${FIND2}${NORMAL}"
+                            #Display --indent 0 --text "   [" --no-break
+                            Progress "    ["
                             . ${PLUGINFILE}
-                            Display --indent 0 --text " "
+                            Progress "]"
+                            Progress --finish
                             logtextbreak
                             logtext "Result: ${FIND2} plugin (phase 1) finished"
                           else