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

1 files changed, 8 insertions, 14 deletions

diff --git a/lynis b/lynis
index e1c52931..0ef69bb9 100755
--- a/lynis
+++ b/lynis
@@ -193,7 +193,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta
     if [ ${MYID} -eq 0 ]; then
         PRIVILEGED=1
       else
-        echo "Start Lynis non-privileged"; echo "";
+        echo "Starting Lynis non-privileged"
         # Implied pentesting mode if not performed by root user
         PENTESTINGMODE=1
     fi
@@ -419,9 +419,8 @@ ${YELLOW}Note: ${WHITE}Cancelling the program can leave temporary files behind${
 #
 #################################################################################
 #
-    if [ ${PRIVILEGED} -eq 0 ]; then
-        printf "%s" "
-${WHITE}
+    if [ ${PRIVILEGED} -eq 0 -a ${CHECK} -eq 1 ]; then
+        printf "%s" "${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 might fail silently or give different results
+
 "
+        sleep 3
         if [ "${LOGFILE}" = "" -o "${LOGFILE}" = "/dev/null" ]; then
             printf "%s" "
   ${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
-        printf "%s" "
-
-  ${WHITE}Press [ENTER] to continue or [CTRL] + C to break${NORMAL}
-
-  ###################################################################
-${NORMAL}
-"
-        if [ ${QUICKMODE} -eq 0 ]; then read void; fi
+        #printf "\n\n%s" "  ${WHITE}Press [ENTER] to continue or [CTRL] + C to break${NORMAL}"
+        #if [ ${QUICKMODE} -eq 0 ]; then read void; fi
     fi
 #
 #################################################################################