diff options
| author | mboelen <michael@cisofy.com> | 2016-04-05 12:31:21 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2016-04-05 12:31:21 +0300 |
| commit | 78167f37f2dd6b6b0b223d56693ec2aa0e2f80c8 (patch) | |
| tree | 824e99b7c793881d7d29b64caf55a706468d46cf | |
| parent | 2f335eea5f6ca0a342f435ad42fb0a37e12fefe3 (diff) | |
Clean up of old variables
| -rw-r--r-- | include/helper_update | 12 | ||||
| -rw-r--r-- | include/parameters | 2 | ||||
| -rw-r--r-- | include/report | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/helper_update b/include/helper_update index a062246e..040745c3 100644 --- a/include/helper_update +++ b/include/helper_update @@ -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 diff --git a/include/parameters b/include/parameters index 7d5a4576..3e59910a 100644 --- a/include/parameters +++ b/include/parameters @@ -253,7 +253,7 @@ # Version number -V | --version) - echo "${PROGRAM_version}" + echo "${PROGRAM_VERSION}" exit 0 ;; diff --git a/include/report b/include/report index dc794412..efeef26b 100644 --- a/include/report +++ b/include/report @@ -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 |