Changes to text output, show scan mode only when doing an actual scan

This commit is contained in:
Michael Boelen 2016-05-03 13:49:55 +02:00
parent c8c7a11e37
commit 11d3b352ac

22
lynis
View File

@ -193,7 +193,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta
if [ ${MYID} -eq 0 ]; then if [ ${MYID} -eq 0 ]; then
PRIVILEGED=1 PRIVILEGED=1
else else
echo "Start Lynis non-privileged"; echo ""; echo "Starting Lynis non-privileged"
# Implied pentesting mode if not performed by root user # Implied pentesting mode if not performed by root user
PENTESTINGMODE=1 PENTESTINGMODE=1
fi fi
@ -419,9 +419,8 @@ ${YELLOW}Note: ${WHITE}Cancelling the program can leave temporary files behind${
# #
################################################################################# #################################################################################
# #
if [ ${PRIVILEGED} -eq 0 ]; then if [ ${PRIVILEGED} -eq 0 -a ${CHECK} -eq 1 ]; then
printf "%s" " printf "%s" "${WHITE}
${WHITE}
################################################################### ###################################################################
# # # #
# ${PURPLE}NON-PRIVILEGED SCAN MODE${WHITE} # # ${PURPLE}NON-PRIVILEGED SCAN MODE${WHITE} #
@ -432,21 +431,16 @@ ${NORMAL}
-------------- --------------
${WHITE}*${NORMAL} Some tests will be skipped (as they require root permissions) ${WHITE}*${NORMAL} Some tests will be skipped (as they require root permissions)
${WHITE}*${NORMAL} Some tests might fail silently or give different results ${WHITE}*${NORMAL} Some tests might fail silently or give different results
" "
sleep 3
if [ "${LOGFILE}" = "" -o "${LOGFILE}" = "/dev/null" ]; then if [ "${LOGFILE}" = "" -o "${LOGFILE}" = "/dev/null" ]; then
printf "%s" " printf "%s" "
${RED}WARNING:${NORMAL} ${RED}WARNING:${NORMAL}
${WHITE}*${NORMAL} No suggestions or warnings will be displayed in report (due to missing log file) ${WHITE}*${NORMAL} No suggestions or warnings will be displayed in report (due to missing log file)"
"
fi fi
printf "%s" " #printf "\n\n%s" " ${WHITE}Press [ENTER] to continue or [CTRL] + C to break${NORMAL}"
#if [ ${QUICKMODE} -eq 0 ]; then read void; fi
${WHITE}Press [ENTER] to continue or [CTRL] + C to break${NORMAL}
###################################################################
${NORMAL}
"
if [ ${QUICKMODE} -eq 0 ]; then read void; fi
fi fi
# #
################################################################################# #################################################################################