From 7b819b4eca20f2dd26b4b336cd651e2b94c3d5b2 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Tue, 17 May 2016 18:12:49 +0200 Subject: [PATCH] Show release as version with release type (e.g. 2.2.0-dev) --- include/helper_show | 3 ++- lynis | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/helper_show b/include/helper_show index 37401113..fe37c52e 100644 --- a/include/helper_show +++ b/include/helper_show @@ -175,7 +175,7 @@ if [ $# -gt 0 ]; then "profile" | "profiles") for I in ${PROFILES}; do ${ECHOCMD} ${I}; done ;; "profiledir") ${ECHOCMD} "${PROFILEDIR}" ;; "plugindir") ${ECHOCMD} "${PLUGINDIR}" ;; - "release" | "version") ${ECHOCMD} "${PROGRAM_VERSION}" ;; + "release") ${ECHOCMD} "${PROGRAM_VERSION}-${PROGRAM_RELEASE_TYPE}" ;; "releasedate") ${ECHOCMD} "${PROGRAM_RELEASE_DATE}" ;; "tests") if [ $# -gt 0 ]; then @@ -192,6 +192,7 @@ if [ $# -gt 0 ]; then ${ECHOCMD} "Need more arguments" fi ;; + "version") ${ECHOCMD} "${PROGRAM_VERSION}" ;; "workdir") ${ECHOCMD} "${WORKDIR}" ;; "?") ${ECHOCMD} "${SHOW_ARGS}" ;; *) ${ECHOCMD} "Unknown argument '$1'" ;; diff --git a/lynis b/lynis index ce2f3f98..b7b6361a 100755 --- a/lynis +++ b/lynis @@ -34,7 +34,7 @@ # Version details PROGRAM_RELEASE_DATE="2016-05-17" PROGRAM_RELEASE_TIMESTAMP=1463501311 - PROGRAM_RELEASETYPE="dev" # dev or final + PROGRAM_RELEASE_TYPE="dev" # dev or final PROGRAM_VERSION="2.2.1" # Source, documentation and license @@ -241,7 +241,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta printf "\n${WHITE}[ ${PROGRAM_NAME} ${PROGRAM_VERSION} ]${NORMAL}\n\n################################################################################\n ${PROGRAM_LICENSE}\n ${PROGRAM_COPYRIGHT}\n ${PROGRAM_EXTRAINFO}\n################################################################################\n\n" fi - if [ "${PROGRAM_RELEASETYPE}" = "beta" ]; then + if [ "${PROGRAM_RELEASE_TYPE}" = "beta" ]; then printf "%s" " ${WHITE} #########################################################