mirror of https://github.com/CISOfy/lynis.git
Changed progress display on screen (of plugins)
This commit is contained in:
parent
a5a702a1da
commit
df4d934eb8
12
lynis
12
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
|
||||
|
|
Loading…
Reference in New Issue