tyler.durden/lynis
1
0
Fork 0
mirror of https://github.com/CISOfy/lynis.git synced 2025-07-24 22:34:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed progress display on screen (of plugins)

Browse Source
This commit is contained in:
mboelen 2014-12-03 22:43:53 +01:00
parent a5a702a1da
commit df4d934eb8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lynis
View File

@ -579,7 +579,7 @@
echo " ${WHITE}Please update to the latest version for new features, bug fixes, tests" echo " ${WHITE}Please update to the latest version for new features, bug fixes, tests"
echo " and baselines.${NORMAL}" echo " and baselines.${NORMAL}"
echo "" echo ""
echo " http://cisofy.com/downloads/" echo " https://cisofy.com/downloads/"
echo "" echo ""
echo " ===============================================================================" echo " ==============================================================================="
echo "" echo ""
@ -634,7 +634,7 @@
FIND3=`grep "^plugin=${FIND2}" ${PROFILE}` FIND3=`grep "^plugin=${FIND2}" ${PROFILE}`
if [ ! "${FIND3}" = "" ]; then if [ ! "${FIND3}" = "" ]; then
logtext "Plugin ${FIND2} is enabled" 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" PLUGINFILE="${PLUGINDIR}/plugin_${FIND2}_phase1"
if [ -f ${PLUGINFILE} ]; then if [ -f ${PLUGINFILE} ]; then
PLUGIN_VERSION=`grep "^# PLUGIN_VERSION=" ${I} | awk -F= '{ print $2 }'` PLUGIN_VERSION=`grep "^# PLUGIN_VERSION=" ${I} | awk -F= '{ print $2 }'`
@ -644,10 +644,12 @@
logtext "Including plugin file: ${PLUGINFILE} (version: ${PLUGIN_VERSION})" logtext "Including plugin file: ${PLUGINFILE} (version: ${PLUGIN_VERSION})"
report "plugin_enabled_phase1[]=${FIND2}|${PLUGIN_VERSION}|" report "plugin_enabled_phase1[]=${FIND2}|${PLUGIN_VERSION}|"
N_PLUGIN_ENABLED=`expr ${N_PLUGIN_ENABLED} + 1` N_PLUGIN_ENABLED=`expr ${N_PLUGIN_ENABLED} + 1`
#logtext "PLUGIN EXECUTION SKIPPED, STILL EXPERIMENTAL" Display --indent 2 --text "- ${CYAN}Plugin${NORMAL}: ${WHITE}${FIND2}${NORMAL}"
Display --indent 2 --text "- ${CYAN}Plugin${NORMAL}: ${WHITE}${FIND2}${NORMAL}" --no-break #Display --indent 0 --text " [" --no-break
Progress " ["
. ${PLUGINFILE} . ${PLUGINFILE}
Display --indent 0 --text " " Progress "]"
Progress --finish
logtextbreak logtextbreak
logtext "Result: ${FIND2} plugin (phase 1) finished" logtext "Result: ${FIND2} plugin (phase 1) finished"
else else