Display when pentesting mode is used

1 files changed, 21 insertions, 22 deletions

diff --git a/lynis b/lynis
index 66f79b48..928b4cc5 100755
--- a/lynis
+++ b/lynis
@@ -243,10 +243,23 @@
 #
 #################################################################################
 #
+
+    if [ ${QUIET} -eq 0 ]; then
+        echo ""
+        echo "${WHITE}[ ${PROGRAM_name} ${PROGRAM_version} ]${NORMAL}"
+        echo ""
+        echo "################################################################################"
+        echo " ${PROGRAM_license}"
+        echo ""
+        echo " ${PROGRAM_copyright}"
+        echo " ${PROGRAM_extrainfo}"
+        echo "################################################################################"
+    fi
+
     if [ "${PROGRAM_releasetype}" = "beta" ]; then
-        echo "${YELLOW}"
+        echo "${WHITE}"
         echo "  #########################################################"
-        echo "  #   BETA SOFTWARE                                       #"
+        echo "  #   ${YELLOW}BETA VERSION${WHITE}                                        #"
         echo "  #########################################################"
         echo ""
         echo "  Thank you for testing a beta release. Make sure to read"
@@ -261,26 +274,15 @@
         if [ ${NEVERBREAK} -eq 0 ]; then read void; fi
     fi
 
-    if [ ${QUIET} -eq 0 ]; then
-        echo ""
-        echo "${WHITE}[ ${PROGRAM_name} ${PROGRAM_version} ]${NORMAL}"
-        echo ""
-        echo "################################################################################"
-        echo " ${PROGRAM_license}"
-        echo ""
-        echo " ${PROGRAM_copyright}"
-        echo " ${PROGRAM_extrainfo}"
-        echo "################################################################################"
-    fi
-
     if [ ${PENTESTINGMODE} -eq 1 ]; then
-        echo "${PURPLE}"
+        echo "${WHITE}"
         echo "  #########################################################"
-        echo "  #   NON-PRIVILEGED mode (e.g. pentesting)               #"
+        echo "  #   ${PURPLE}NON-PRIVILEGED mode (e.g. pentesting)${WHITE}               #"
         echo "  #########################################################"
-        echo ""
-        echo "  Some tests will require root permissions"
-        echo "  Logging is disabled (no log and no report)"
+        echo "${NORMAL}"
+        echo "  ${WHITE}NOTES:${NORMAL}"
+        echo "  * Some tests will require root permissions"
+        echo "  * Logging is disabled (no log and no report)"
         echo ""
         echo "  Press [ENTER] to continue or [CTRL] + C to break"
         echo ""
@@ -288,9 +290,6 @@
         echo "${NORMAL}"; echo ""
         if [ ${NEVERBREAK} -eq 0 ]; then read void; fi
     fi
-
-
-
 #
 #################################################################################
 #