From 72029a67914aa06c81d4f39e9939ac4c06df7dfc Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <alain.reguera@gmail.com>
Date: Jan 22 2011 16:43:26 +0000
Subject: Update `render' functionality:


    - Rename render_checkConfig.sh to render_getIdentityConfig.sh.


---

diff --git a/Scripts/Bash/Functions/Render/render_checkConfig.sh b/Scripts/Bash/Functions/Render/render_checkConfig.sh
deleted file mode 100755
index 9708f52..0000000
--- a/Scripts/Bash/Functions/Render/render_checkConfig.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-# render_checkConfig.sh -- This function checks/validates variables
-# passed from artwork-specific pre-rendition configuration files.
-#
-# Copyright (C) 2009-2011 Alain Reguera Delgado
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-# 
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function render_checkConfig {
-
-    local BASECOUNT=0
-    local POSTCOUNT=0
-    local LASTCOUNT=0
-
-    # Re-define action variables in separated array variables. Once
-    # verification is done, we remove the BASE, POST, LAST parts from
-    # action definition in order to have the plain name of function to
-    # call.
-    for ACTION in "${ACTIONS[@]}"; do
-
-        # Define base-rendition actions.
-        if [[ $ACTION =~ '^BASE:render(Text|Image)$' ]];then
-            ACTION=$(render_getConfOption "$ACTION" '2-')
-            BASEACTIONS[$BASECOUNT]="$ACTION"
-            BASECOUNT=$(($BASECOUNT + 1))
-
-        # Define post-rendition actions.
-        elif [[ $ACTION =~ '^POST:' ]];then
-            ACTION=$(render_getConfOption "$ACTION" '2-')
-            POSTACTIONS[$POSTCOUNT]="$ACTION"
-            POSTCOUNT=$(($POSTCOUNT + 1))
-
-        # Define last-rendition actions.
-        elif [[ $ACTION =~ '^LAST:' ]];then
-            ACTION=$(render_getConfOption "$ACTION" '2-')
-            LASTACTIONS[$LASTCOUNT]="$ACTION"
-            LASTCOUNT=$(($LASTCOUNT + 1))
-        fi
-
-    done
-
-    # Check base-rendition actions. The base-rendition action defines
-    # what kind of rendition does centos-art.sh script performs.
-    # Presently, we only support image rendition (renderImage) and
-    # text rendition (renderText) as base-rendition actions. 
-    if [[ ${#BASEACTIONS[*]} -lt 1 ]];then
-        cli_printMessage "`gettext "The BASE action is not defined."`"
-        cli_printMessage "$(caller)" "AsToKnowMoreLine"
-    elif [[ ${#BASEACTIONS[*]} -gt 1 ]];then
-        cli_printMessage "`gettext "Just one definition for BASE action is supported."`"
-        cli_printMessage "$(caller)" "AsToKnowMoreLine"
-    fi
-
-    # Check post-rendition actions. Validation of post-rendition
-    # actions is action-specific. So, validation of post-rendition
-    # actions is not here, but inside action-specific functions. See
-    # render_doIdentityImages and render_doIdentityTexts to see
-    # validation of renderImage and renderText post-rendition actions,
-    # respectively.
-
-    # Re-define matching list to reduce the amount of empty spaces.
-    MATCHINGLIST=$(echo "$MATCHINGLIST" | tr -s '  ' | sed 's!^ !!')
-
-    # Re-define theme model value using repository directory name
-    # convenction.
-    THEMEMODEL=$(cli_getRepoName "$THEMEMODEL" 'd')
-
-    # Check theme model name.
-    if [[ $THEMEMODEL == '' ]] \
-        || [[ ! -d "/home/centos/artwork/trunk/Identity/Themes/Models/$THEMEMODEL" ]];then
-
-        cli_printMessage "`eval_gettext "The \\\"\\\$THEMEMODEL\\\" theme model doesn't exist."`"
-        cli_printMessage "$(caller)" "AsToKnowMoreLine"
-
-    fi
-
-}
diff --git a/Scripts/Bash/Functions/Render/render_doIdentity.sh b/Scripts/Bash/Functions/Render/render_doIdentity.sh
index 0b84ece..08694e8 100755
--- a/Scripts/Bash/Functions/Render/render_doIdentity.sh
+++ b/Scripts/Bash/Functions/Render/render_doIdentity.sh
@@ -89,7 +89,7 @@ function render_doIdentity {
 
         # Check variables passed from artwork-specific pre-rendition
         # configuration scripts and make required transformations.
-        render_checkConfig
+        render_getIdentityConfig
 
         # Redefine action value (ACTIONVAL) based on pre-rendition
         # configuration script path value. Otherwise, massive
diff --git a/Scripts/Bash/Functions/Render/render_getIdentityConfig.sh b/Scripts/Bash/Functions/Render/render_getIdentityConfig.sh
new file mode 100755
index 0000000..5bdbf99
--- /dev/null
+++ b/Scripts/Bash/Functions/Render/render_getIdentityConfig.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+#
+# render_getIdentityConfig.sh -- This function checks/validates variables
+# passed from artwork-specific pre-rendition configuration files.
+#
+# Copyright (C) 2009-2011 Alain Reguera Delgado
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+# 
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+
+function render_getIdentityConfig {
+
+    local BASECOUNT=0
+    local POSTCOUNT=0
+    local LASTCOUNT=0
+
+    # Re-define action variables in separated array variables. Once
+    # verification is done, we remove the BASE, POST, LAST parts from
+    # action definition in order to have the plain name of function to
+    # call.
+    for ACTION in "${ACTIONS[@]}"; do
+
+        # Define base-rendition actions.
+        if [[ $ACTION =~ '^BASE:render(Text|Image)$' ]];then
+            ACTION=$(render_getConfOption "$ACTION" '2-')
+            BASEACTIONS[$BASECOUNT]="$ACTION"
+            BASECOUNT=$(($BASECOUNT + 1))
+
+        # Define post-rendition actions.
+        elif [[ $ACTION =~ '^POST:' ]];then
+            ACTION=$(render_getConfOption "$ACTION" '2-')
+            POSTACTIONS[$POSTCOUNT]="$ACTION"
+            POSTCOUNT=$(($POSTCOUNT + 1))
+
+        # Define last-rendition actions.
+        elif [[ $ACTION =~ '^LAST:' ]];then
+            ACTION=$(render_getConfOption "$ACTION" '2-')
+            LASTACTIONS[$LASTCOUNT]="$ACTION"
+            LASTCOUNT=$(($LASTCOUNT + 1))
+        fi
+
+    done
+
+    # Check base-rendition actions. The base-rendition action defines
+    # what kind of rendition does centos-art.sh script performs.
+    # Presently, we only support image rendition (renderImage) and
+    # text rendition (renderText) as base-rendition actions. 
+    if [[ ${#BASEACTIONS[*]} -lt 1 ]];then
+        cli_printMessage "`gettext "The BASE action is not defined."`"
+        cli_printMessage "$(caller)" "AsToKnowMoreLine"
+    elif [[ ${#BASEACTIONS[*]} -gt 1 ]];then
+        cli_printMessage "`gettext "Just one definition for BASE action is supported."`"
+        cli_printMessage "$(caller)" "AsToKnowMoreLine"
+    fi
+
+    # Check post-rendition actions. Validation of post-rendition
+    # actions is action-specific. So, validation of post-rendition
+    # actions is not here, but inside action-specific functions. See
+    # render_doIdentityImages and render_doIdentityTexts to see
+    # validation of renderImage and renderText post-rendition actions,
+    # respectively.
+
+    # Re-define matching list to reduce the amount of empty spaces.
+    MATCHINGLIST=$(echo "$MATCHINGLIST" | tr -s '  ' | sed 's!^ !!')
+
+    # Re-define theme model value using repository directory name
+    # convenction.
+    THEMEMODEL=$(cli_getRepoName "$THEMEMODEL" 'd')
+
+    # Check theme model name.
+    if [[ $THEMEMODEL == '' ]] \
+        || [[ ! -d "/home/centos/artwork/trunk/Identity/Themes/Models/$THEMEMODEL" ]];then
+
+        cli_printMessage "`eval_gettext "The \\\"\\\$THEMEMODEL\\\" theme model doesn't exist."`"
+        cli_printMessage "$(caller)" "AsToKnowMoreLine"
+
+    fi
+
+}