From 63cb061777b93d7c61013729229397869c965d4b Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Oct 09 2013 20:01:23 +0000 Subject: Update centos-art.sh scripts and modules. - Previously, tcar_setModuleEnvironment was using top-module, sub-module and sib-module as names for module's types. This update changes scripts and modules to use parent, child, and sibling as names for module's types instead. --- diff --git a/Automation/Modules/Locale/Modules/Actions/Modules/Update/update.sh b/Automation/Modules/Locale/Modules/Actions/Modules/Update/update.sh index 186431c..0c5895a 100755 --- a/Automation/Modules/Locale/Modules/Actions/Modules/Update/update.sh +++ b/Automation/Modules/Locale/Modules/Actions/Modules/Update/update.sh @@ -27,6 +27,6 @@ function update { - tcar_setModuleEnvironment -m "${RENDER_TYPE}" -t "sub-module" + tcar_setModuleEnvironment -m "${RENDER_TYPE}" -t "child" } diff --git a/Automation/Modules/Locale/Modules/Actions/actions.sh b/Automation/Modules/Locale/Modules/Actions/actions.sh index 6a966f5..f0ae6b5 100755 --- a/Automation/Modules/Locale/Modules/Actions/actions.sh +++ b/Automation/Modules/Locale/Modules/Actions/actions.sh @@ -30,7 +30,7 @@ function actions { local ACTION='' for ACTION in ${ACTIONS};do - tcar_setModuleEnvironment -m "${ACTION}" -t "sub-module" + tcar_setModuleEnvironment -m "${ACTION}" -t "child" done } diff --git a/Automation/Modules/Locale/Modules/Directory/directory_getConfiguration.sh b/Automation/Modules/Locale/Modules/Directory/directory_getConfiguration.sh index 5d1f944..edafb68 100755 --- a/Automation/Modules/Locale/Modules/Directory/directory_getConfiguration.sh +++ b/Automation/Modules/Locale/Modules/Directory/directory_getConfiguration.sh @@ -103,7 +103,7 @@ function directory_getConfiguration { local PACKAGE_VERSION=${TCAR_SCRIPT_VERSION} # Initialize locale's actions module. - tcar_setModuleEnvironment -m "actions" -t "sib-module" + tcar_setModuleEnvironment -m "actions" -t "sibling" # Increment section's counter. COUNTER=$(( ${COUNTER} + 1 )) diff --git a/Automation/Modules/Locale/Modules/File/file.sh b/Automation/Modules/Locale/Modules/File/file.sh index 3145382..f967709 100755 --- a/Automation/Modules/Locale/Modules/File/file.sh +++ b/Automation/Modules/Locale/Modules/File/file.sh @@ -83,7 +83,7 @@ function file { local PACKAGE_VERSION=${TCAR_SCRIPT_VERSION} # Process configuration variables through locale's actions module. - tcar_setModuleEnvironment -m "actions" -t "sib-module" + tcar_setModuleEnvironment -m "actions" -t "sibling" # Print report about how many files were processed. if [[ ${LOCALE_FLAG_REPORT} == 'true' ]];then diff --git a/Automation/Modules/Locale/locale.sh b/Automation/Modules/Locale/locale.sh index f8881cc..7341ea4 100755 --- a/Automation/Modules/Locale/locale.sh +++ b/Automation/Modules/Locale/locale.sh @@ -61,9 +61,9 @@ function locale { local ARGUMENT=$(tcar_checkRepoDirSource "${ARGUMENT}") if [[ -f ${ARGUMENT} ]];then - tcar_setModuleEnvironment -m "file" -t "sub-module" "${ARGUMENT}" + tcar_setModuleEnvironment -m "file" -t "child" "${ARGUMENT}" elif [[ -d ${ARGUMENT} ]];then - tcar_setModuleEnvironment -m "directory" -t "sub-module" "${ARGUMENT}" + tcar_setModuleEnvironment -m "directory" -t "child" "${ARGUMENT}" else tcar_printMessage "`gettext "The argument provided isn't valid."`" --as-error-line fi diff --git a/Automation/Modules/Prepare/prepare.sh b/Automation/Modules/Prepare/prepare.sh index 5be60ac..a788963 100755 --- a/Automation/Modules/Prepare/prepare.sh +++ b/Automation/Modules/Prepare/prepare.sh @@ -46,7 +46,7 @@ function prepare { fi for ACTION in ${ACTIONS};do - tcar_setModuleEnvironment -m "${ACTION}" -t "sub-module" + tcar_setModuleEnvironment -m "${ACTION}" -t "child" done } diff --git a/Automation/Modules/Prepare/prepare_setRenderEnvironment.sh b/Automation/Modules/Prepare/prepare_setRenderEnvironment.sh index 09127dd..dc8d91e 100755 --- a/Automation/Modules/Prepare/prepare_setRenderEnvironment.sh +++ b/Automation/Modules/Prepare/prepare_setRenderEnvironment.sh @@ -109,5 +109,5 @@ function prepare_setRenderEnvironment { done # Process the list of configuration files using the render module. - tcar_setModuleEnvironment -m "render" -t "top-module" ${CONFIGURATION_FILES[*]} + tcar_setModuleEnvironment -m "render" -t "parent" ${CONFIGURATION_FILES[*]} } diff --git a/Automation/Modules/Render/Modules/Asciidoc/asciidoc_setBaseRendition.sh b/Automation/Modules/Render/Modules/Asciidoc/asciidoc_setBaseRendition.sh index 979de07..bc72693 100755 --- a/Automation/Modules/Render/Modules/Asciidoc/asciidoc_setBaseRendition.sh +++ b/Automation/Modules/Render/Modules/Asciidoc/asciidoc_setBaseRendition.sh @@ -69,7 +69,7 @@ function asciidoc_setBaseRendition { # Initiate format-specific transformations for current render # flow. for DOCBOOK_FILE in ${TARGET_INSTANCES[*]};do - tcar_setModuleEnvironment -m "${RENDER_FLOW}" -t "sub-module" + tcar_setModuleEnvironment -m "${RENDER_FLOW}" -t "child" done } diff --git a/Automation/Modules/Render/Modules/Svg/svg.sh b/Automation/Modules/Render/Modules/Svg/svg.sh index 1476f76..d7f007b 100755 --- a/Automation/Modules/Render/Modules/Svg/svg.sh +++ b/Automation/Modules/Render/Modules/Svg/svg.sh @@ -52,7 +52,7 @@ function svg { fi for RENDER_FLOW in ${RENDER_FLOWS} ;do - tcar_setModuleEnvironment -m "${RENDER_FLOW}" -t "sub-module" + tcar_setModuleEnvironment -m "${RENDER_FLOW}" -t "child" done } diff --git a/Automation/Modules/Render/render_setRenderType.sh b/Automation/Modules/Render/render_setRenderType.sh index c9376a1..f708186 100755 --- a/Automation/Modules/Render/render_setRenderType.sh +++ b/Automation/Modules/Render/render_setRenderType.sh @@ -131,10 +131,10 @@ function render_setRenderType { # Initialize render's modules. case ${RENDER_TYPE} in "svgz" | "svg" ) - tcar_setModuleEnvironment -m "svg" -t "sub-module" + tcar_setModuleEnvironment -m "svg" -t "child" ;; * ) - tcar_setModuleEnvironment -m "${RENDER_TYPE}" -t "sub-module" + tcar_setModuleEnvironment -m "${RENDER_TYPE}" -t "child" ;; esac diff --git a/Automation/Modules/Tuneup/tuneup.sh b/Automation/Modules/Tuneup/tuneup.sh index 01cf42c..c1c55f7 100755 --- a/Automation/Modules/Tuneup/tuneup.sh +++ b/Automation/Modules/Tuneup/tuneup.sh @@ -66,7 +66,7 @@ function tuneup { fi # Initiate module's environment for processing file. - tcar_setModuleEnvironment -m "${FILE_EXTENSION}" -t "sub-module" "${FILE}" + tcar_setModuleEnvironment -m "${FILE_EXTENSION}" -t "child" "${FILE}" done diff --git a/Automation/Scripts/tcar_setModuleEnvironment.sh b/Automation/Scripts/tcar_setModuleEnvironment.sh index 82b65d8..4646f05 100755 --- a/Automation/Scripts/tcar_setModuleEnvironment.sh +++ b/Automation/Scripts/tcar_setModuleEnvironment.sh @@ -55,10 +55,10 @@ function tcar_setModuleEnvironment { # initialization script is stored in. local TCAR_MODULE_BASEDIR=${TCAR_SCRIPT_MODULES_BASEDIR} if [[ ${#TCAR_MODULE_BASEDIRS[*]} -gt 0 ]];then - if [[ ${ARG_MODULE_TYPE} == "top-module" ]];then + if [[ ${ARG_MODULE_TYPE} == "parent" ]];then TCAR_MODULE_BASEDIR=${TCAR_SCRIPT_MODULES_BASEDIR} - elif [[ ${ARG_MODULE_TYPE} == "sib-module" ]];then - if [[ ${TCAR_MODULE_TYPES[((${TCAR_MODULE_COUNT} - 1 ))]} == 'sib-module' ]];then + elif [[ ${ARG_MODULE_TYPE} == "sibling" ]];then + if [[ ${TCAR_MODULE_TYPES[((${TCAR_MODULE_COUNT} - 1 ))]} == 'sibling' ]];then TCAR_MODULE_BASEDIR=${TCAR_MODULE_BASEDIRS[((${TCAR_MODULE_COUNT}-2))]} else TCAR_MODULE_BASEDIR=${TCAR_MODULE_BASEDIRS[((${TCAR_MODULE_COUNT}-1))]} @@ -75,7 +75,7 @@ function tcar_setModuleEnvironment { tcar_printMessage "TCAR_MODULE_NAME : [${TCAR_MODULE_COUNT}]=${TCAR_MODULE_NAME} | ${#TCAR_MODULE_NAMES[*]}" --as-debugger-line # Define module's type. - TCAR_MODULE_TYPES[${TCAR_MODULE_COUNT}]="${ARG_MODULE_TYPE:-top-module}" + TCAR_MODULE_TYPES[${TCAR_MODULE_COUNT}]="${ARG_MODULE_TYPE:-parent}" local TCAR_MODULE_TYPE=${TCAR_MODULE_TYPES[${TCAR_MODULE_COUNT}]} tcar_printMessage "TCAR_MODULE_TYPE : ${TCAR_MODULE_TYPE}" --as-debugger-line