From e0066e37c99194d0a7a0f82fa20bff93f8433a39 Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <alain.reguera@gmail.com>
Date: Jan 26 2011 20:10:32 +0000
Subject: Rename cli_getThemeName to cli_getPathComponent, inside `render'

functionality.


---

diff --git a/Scripts/Bash/Functions/Render/render_doIdentity.sh b/Scripts/Bash/Functions/Render/render_doIdentity.sh
index 08694e8..ef8edb7 100755
--- a/Scripts/Bash/Functions/Render/render_doIdentity.sh
+++ b/Scripts/Bash/Functions/Render/render_doIdentity.sh
@@ -98,7 +98,7 @@ function render_doIdentity {
         # stored).
         ACTIONVAL=$(dirname $(echo $FILE | sed -r \
             -e 's!Scripts/Bash/Functions/Render/Config/Identity/!Identity/!' \
-            -e "s!Themes/!Themes/Motifs/$(cli_getThemeName)/!"))
+            -e "s!Themes/!Themes/Motifs/$(cli_getPathComponent '--theme')/!"))
 
         # Redefine artwork identification.
         ARTCOMP=$(echo $ACTIONVAL | cut -d/ -f6-)
@@ -107,8 +107,8 @@ function render_doIdentity {
         # reuse motif artwork identification. There is not need to
         # create one artwork identification for each motif directory
         # structure if we can reuse just one.
-        if [[ $ARTCOMP =~ "Themes/Motifs/$(cli_getThemeName)/" ]];then
-            ARTCOMP=$(echo $ARTCOMP | sed -r "s!Themes/Motifs/$(cli_getThemeName)/!Themes/!")
+        if [[ $ARTCOMP =~ "Themes/Motifs/$(cli_getPathComponent '--theme')/" ]];then
+            ARTCOMP=$(echo $ARTCOMP | sed -r "s!Themes/Motifs/$(cli_getPathComponent '--theme')/!Themes/!")
         fi
 
         # Start rendition as defined in artwork-specific pre-rendition
diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh b/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh
index 8b349ed..3e04518 100644
--- a/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh
+++ b/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh
@@ -60,7 +60,7 @@ function render_doIdentityImageGrub {
     done
 
     # Define motif's palette location.
-    local PALETTES=$(cli_getRepoTLDir)/Identity/Themes/Motifs/$(cli_getThemeName)/Colors
+    local PALETTES=$(cli_getRepoTLDir)/Identity/Themes/Motifs/$(cli_getPathComponent '--theme')/Colors
     
     # Define the Netpbm color palettes used when reducing colors.
     # These palettes should be 14 colors based. For more information
diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh b/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh
index 328b0bb..d71002b 100755
--- a/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh
+++ b/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh
@@ -60,7 +60,7 @@ function render_doIdentityImageSyslinux {
     fi
 
     # Define motif's palette location.
-    local PALETTES=$(cli_getRepoTLDir)/Identity/Themes/Motifs/$(cli_getThemeName)/Colors
+    local PALETTES=$(cli_getRepoTLDir)/Identity/Themes/Motifs/$(cli_getPathComponent '--theme')/Colors
    
     # Define the Netpbm color palette used when reducing colors. This
     # palette should be 16 colors based. For more information on this
diff --git a/Scripts/Bash/Functions/Render/render_getActions.sh b/Scripts/Bash/Functions/Render/render_getActions.sh
index cf84842..0f4f8ef 100644
--- a/Scripts/Bash/Functions/Render/render_getActions.sh
+++ b/Scripts/Bash/Functions/Render/render_getActions.sh
@@ -121,7 +121,7 @@ function render_getActions {
     # rendered.
     local ARTCONF=$(echo "$ACTIONVAL" \
         | sed -r -e 's!/(Identity|Translations)!/Scripts/Bash/Functions/Render/Config/\1!' \
-                 -e "s!Motifs/$(cli_getThemeName)/?!!")
+                 -e "s!Motifs/$(cli_getPathComponent '--theme')/?!!")
 
     # Execute action name.
     if [[ $ACTIONNAM =~ "^${FUNCNAM}_[A-Za-z]+$" ]];then
diff --git a/Scripts/Bash/Functions/Render/render_getIdentityDirTemplate.sh b/Scripts/Bash/Functions/Render/render_getIdentityDirTemplate.sh
index 7d568bb..230d39e 100644
--- a/Scripts/Bash/Functions/Render/render_getIdentityDirTemplate.sh
+++ b/Scripts/Bash/Functions/Render/render_getIdentityDirTemplate.sh
@@ -53,7 +53,7 @@ function render_getIdentityDirTemplate {
         # defined in the associated pre-rendition configuration script
         # and can be used to set which design model to use among a
         # list of different design models that we can choose from.
-        SVG=$(echo "$SVG" | sed "s!Motifs/$(cli_getThemeName)!Models/$THEMEMODEL!")
+        SVG=$(echo "$SVG" | sed "s!Motifs/$(cli_getPathComponent '--theme')!Models/$THEMEMODEL!")
     fi
 
 }