Move to development version and no longer show upgrade message when being quiet/silent

2 files changed, 13 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c3b0854..40938ba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Lynis Changelog
 ===============
 
+Lynis 2.5.9 (not released yet)
+
+Changes:
+--------
+* Don't show upgrade notice when being quiet/silent
+
+---------------------------------------------------------------------------------
+
 Lynis 2.5.8 (2017-12-28)
 
 Changes:
diff --git a/lynis b/lynis
index 7077bfeb..122c9f0f 100755
--- a/lynis
+++ b/lynis
@@ -37,8 +37,8 @@
     # Version details
     PROGRAM_RELEASE_DATE="2017-12-28"
     PROGRAM_RELEASE_TIMESTAMP=1514461655
-    PROGRAM_RELEASE_TYPE="final" # dev or final
-    PROGRAM_VERSION="2.5.8"
+    PROGRAM_RELEASE_TYPE="dev" # dev or final
+    PROGRAM_VERSION="2.5.9"
 
     # Source, documentation and license
     PROGRAM_SOURCE="https://github.com/CISOfy/lynis"
@@ -732,8 +732,8 @@ ${NORMAL}
         OLD_RELEASE=1
     fi
 
-    # Show on screen message if release is very outdated
-    if [ ${UPDATE_AVAILABLE} -eq 1 ]; then
+    # Show on screen message if release is very outdated (unless --quiet/--silent is used)
+    if [ ${UPDATE_AVAILABLE} -eq 1 -a ${QUIET} -eq 0 ]; then
         echo ""
         echo "      ==============================================================================="
         echo "        ${CYAN}${PROGRAM_NAME} ${TEXT_UPDATE_AVAILABLE}${NORMAL}"
@@ -751,6 +751,7 @@ ${NORMAL}
         echo "        New releases include additional features, bug fixes, tests and baselines.${NORMAL}"
         echo ""
         echo "        Download the latest version:"
+        echo ""
         echo "        Packages (DEB/RPM) -  https://packages.cisofy.com"
         echo "        Website            -  https://cisofy.com/downloads/"
         echo "        GitHub             -  https://github.com/CISOfy/lynis"