Clean up of old variables

This commit is contained in:
mboelen 2016-04-05 11:31:21 +02:00
parent 2f335eea5f
commit 78167f37f2
3 changed files with 12 additions and 12 deletions

View File

@ -240,7 +240,7 @@ if [ "$1" = "release" ]; then
elif [ "$1" = "info" ]; then
# CV - Current Version
PROGRAM_AC=`echo ${PROGRAM_version} | awk '{ print $1 }' | sed 's/[.]//g'`
PROGRAM_AC=`echo ${PROGRAM_VERSION} | awk '{ print $1 }' | sed 's/[.]//g'`
PROGRAM_LV=0
CheckUpdates
@ -252,9 +252,9 @@ elif [ "$1" = "info" ]; then
PROGRAM_AC=0; PROGRAM_LV=0
fi
echo ""; echo " == ${WHITE}${PROGRAM_name}${NORMAL} =="
echo ""; echo " == ${WHITE}${PROGRAM_NAME}${NORMAL} =="
echo ""
echo " Version : ${PROGRAM_version}"
echo " Version : ${PROGRAM_VERSION}"
echo -n " Status : "
if [ ${PROGRAM_LV} -eq 0 ]; then
echo "${RED}Unknown${NORMAL}";
@ -265,10 +265,10 @@ elif [ "$1" = "info" ]; then
else
echo "${GREEN}Up-to-date${NORMAL}"
fi
echo " Release date : ${PROGRAM_releasedate}"
echo " Update location : ${PROGRAM_website}"
echo " Release date : ${PROGRAM_RELEASEDATE}"
echo " Update location : ${PROGRAM_WEBSITE}"
echo ""; echo ""
echo "${PROGRAM_copyright}"
echo "${PROGRAM_COPYRIGHT}"
echo ""
# Quit program

View File

@ -253,7 +253,7 @@
# Version number
-V | --version)
echo "${PROGRAM_version}"
echo "${PROGRAM_VERSION}"
exit 0
;;

View File

@ -85,7 +85,7 @@
# Only show overview if not running in quiet mode
if [ ${QUIET} -eq 0 ]; then
echo ""; echo "================================================================================"
echo ""; echo " -[ ${WHITE}${PROGRAM_name} ${PROGRAM_version} Results${NORMAL} ]-"
echo ""; echo " -[ ${WHITE}${PROGRAM_NAME} ${PROGRAM_VERSION} Results${NORMAL} ]-"
echo "";
@ -191,7 +191,7 @@
echo ""
echo "================================================================================"
if [ ${PROGRAM_LV} -gt ${PROGRAM_AC} ]; then
echo " ${NOTICE}Notice: ${WHITE}${PROGRAM_name} update available${NORMAL}"
echo " ${NOTICE}Notice: ${WHITE}${PROGRAM_NAME} update available${NORMAL}"
echo " Current version : ${WHITE}${PROGRAM_AC}${NORMAL} Latest version : ${WHITE}${PROGRAM_LV}${NORMAL}"
echo "================================================================================"
else
@ -245,11 +245,11 @@
Report "hardening_index=${HPINDEX}"
if [ ${QUIET} -eq 0 ]; then
echo " ${PROGRAM_name} ${PROGRAM_version}"
echo " ${PROGRAM_NAME} ${PROGRAM_VERSION}"
echo " Auditing, hardening and compliance for Linux, Mac OS and Unix systems"
echo ""
echo " ${PROGRAM_copyright}"
echo " ${WHITE}${PROGRAM_extrainfo}${NORMAL}"
echo " ${PROGRAM_COPYRIGHT}"
echo " ${WHITE}${PROGRAM_EXTRAINFO}${NORMAL}"
echo ""
echo "================================================================================"
fi