From 7fc7dfbcaa535a15029305a6774fc7cc25ad3713 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Sep 11 2013 17:44:48 +0000 Subject: Update centos-art.sh scripts. - Previously, the --version option printed version about centos-art.sh script in the form NAME vM.N. This commit removes the letter v from printed line. - Previsouly, the --help option looked up module's documentation using the centos-art.sh-${MODULE_NAME} file name inside the script manuals base directory. This is, outside module-specific directory structures. This commit updates the tcar_printVersion function to reflect the fact that module-specific documentation manuals must be inside module-specific directory structures. --- diff --git a/Automation/Scripts/tcar_printHelp.sh b/Automation/Scripts/tcar_printHelp.sh index 53e87b6..f62b703 100755 --- a/Automation/Scripts/tcar_printHelp.sh +++ b/Automation/Scripts/tcar_printHelp.sh @@ -27,14 +27,14 @@ function tcar_printHelp { - local MANPAGE="centos-art.sh-${MODULE_NAME}" + local MANPAGE="${MODULE_NAME}" if [[ ! -z ${1} ]];then MANPAGE=${1} fi - /usr/bin/man -M ${TCAR_SCRIPT_BASEDIR}/Manuals/:${MODULE_DIR_MANUALS}/ \ - "${MANPAGE}" + /usr/bin/man -M ${MODULE_DIR_MANUALS} "${MANPAGE}" + exit 0 } diff --git a/Automation/Scripts/tcar_printVersion.sh b/Automation/Scripts/tcar_printVersion.sh index 80ade44..e899fda 100755 --- a/Automation/Scripts/tcar_printVersion.sh +++ b/Automation/Scripts/tcar_printVersion.sh @@ -27,7 +27,7 @@ function tcar_printVersion { - tcar_printMessage "${MODULE_NAME} (${TCAR_SCRIPT_NAME} v${TCAR_SCRIPT_VERSION})" --as-stdout-line + tcar_printMessage "${MODULE_NAME} (${TCAR_SCRIPT_NAME} ${TCAR_SCRIPT_VERSION})" --as-stdout-line exit 0 }