From 9bd42007459c3f5a63b19d2ce75f9f01b44c1b2d Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <al@centos.org.cu>
Date: Jul 17 2013 20:06:35 +0000
Subject: Update centos-art.sh script.


- Move initialization of module-specific configuration values from
  module-specific initialization file to tcar_setModuleEnvironment
  function. The way configuration values are initialized is common to
  all modules. So, there is no need to have duplicated that block in
  all module-specific initialization files.

---

diff --git a/Automation/Modules/Prepare/prepare.sh b/Automation/Modules/Prepare/prepare.sh
index 4f81b52..1340661 100755
--- a/Automation/Modules/Prepare/prepare.sh
+++ b/Automation/Modules/Prepare/prepare.sh
@@ -37,11 +37,6 @@
 
 function prepare {
 
-    # Initialize module-specific configuration values.
-    if [[ -f ${MODULE_DIR}/${MODULE_NAME}.conf ]];then
-        . ${MODULE_DIR}/${MODULE_NAME}.conf
-    fi
-
     # Interpret arguments and options passed through command-line.
     prepare_getOptions "${@}"
 
diff --git a/Automation/Scripts/tcar_setModuleEnvironment.sh b/Automation/Scripts/tcar_setModuleEnvironment.sh
index 1a6d9fd..bfb8f9c 100755
--- a/Automation/Scripts/tcar_setModuleEnvironment.sh
+++ b/Automation/Scripts/tcar_setModuleEnvironment.sh
@@ -62,11 +62,16 @@ function tcar_setModuleEnvironment {
         tcar_printVersion
     fi
 
-    # Redefine internationalization configuration variables.
+    # Redefine module-specific configuration values.
+    if [[ -f ${MODULE_DIR}/${MODULE_NAME}.conf.sh ]];then
+        . ${MODULE_DIR}/${MODULE_NAME}.conf.sh
+    fi
+
+    # Redefine module-specific internationalization configuration variables.
     declare -x TEXTDOMAIN=${MODULE_NAME}
     declare -x TEXTDOMAINDIR=${MODULE_DIR}/Locales
 
-    # Redefine manuals configuration values.
+    # Redefine module-specific manuals configuration values.
     declare -x TCAR_MANUAL_FILE=${MODULE_DIR}/${MODULE_NAME}.asciidoc
     declare -x TCAR_MANUAL_SEARCHPATH=${MODULE_DIR}/Manuals
     declare -x TCAR_MANUAL_READER="/usr/bin/man -M ${TCAR_MANUAL_SEARCHPATH}"