Show release as version with release type (e.g. 2.2.0-dev)

This commit is contained in:
Michael Boelen 2016-05-17 18:12:49 +02:00
parent a509882ed5
commit 7b819b4eca
2 changed files with 4 additions and 3 deletions

View File

@ -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'" ;;

4
lynis
View File

@ -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}
#########################################################