diff options
| author | mboelen <michael@cisofy.com> | 2014-12-04 00:43:53 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2014-12-04 00:43:53 +0300 |
| commit | df4d934eb8c77ccaad0b252561b32ce62e6e05b0 (patch) | |
| tree | 21c68702a7a600d59742e7468632aae44f06e620 /lynis | |
| parent | a5a702a1da313a055b6f7198ebc92991341c83ae (diff) | |
Changed progress display on screen (of plugins)
Diffstat (limited to 'lynis')
| -rwxr-xr-x | lynis | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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 |