From 5a6a0fd00a2718f47dd6bb597736816b1873a7c3 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Mar 02 2011 17:48:14 +0000 Subject: Update `identity' functionality: - Fix path to pre-rendition configuration directory. - Fix position of separator line to remove duplication. - Fix typo at cli_printActionPreamble calling. --- diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_getActions.sh b/Scripts/Bash/Cli/Functions/Identity/identity_getActions.sh index 1daa39e..c80a2fc 100644 --- a/Scripts/Bash/Cli/Functions/Identity/identity_getActions.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_getActions.sh @@ -123,7 +123,7 @@ function identity_getActions { # scripts. The render.conf.sh script defines how each identity # content is rendered. local ARTCONF=$(echo "$ACTIONVAL" \ - | sed -r -e 's!/(Identity)!/Scripts/Bash/Functions/Identity/Config/\1!' \ + | sed -r -e 's!/(Identity)!/Scripts/Bash/Cli/Functions/Identity/Config/\1!' \ -e "s!Motifs/$(cli_getPathComponent '--theme')/?!!") # Check directory of pre-rendition configuration script. diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_render.sh b/Scripts/Bash/Cli/Functions/Identity/identity_render.sh index 288713e..4f54cd7 100755 --- a/Scripts/Bash/Cli/Functions/Identity/identity_render.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_render.sh @@ -41,7 +41,7 @@ function identity_render { local FILES=$(cli_getFilesList "$ARTCONF" ".*/?render\.conf\.sh") # Set action preamble. - cli_printAction Preamble "$FILES" + cli_printActionPreamble "$FILES" # Process list of files. for FILE in $FILES;do @@ -75,7 +75,7 @@ function identity_render { # the exact artwork path (that is, where images will be # stored). ACTIONVAL=$(dirname $(echo $FILE | sed -r \ - -e 's!Scripts/Bash/Functions/Identity/Config/(Identity)/!\1/!' \ + -e 's!Scripts/Bash/Cli/Functions/Identity/Config/(Identity)/!\1/!' \ -e "s!Themes/!Themes/Motifs/$(cli_getPathComponent '--theme')/!")) # Redefine artwork identification using redefined action diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_renderBase.sh b/Scripts/Bash/Cli/Functions/Identity/identity_renderBase.sh index a280c38..9f88931 100755 --- a/Scripts/Bash/Cli/Functions/Identity/identity_renderBase.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_renderBase.sh @@ -71,6 +71,9 @@ function identity_renderBase { # approching :-). for FILE in $FILES; do + # Print separator line. + cli_printMessage '-' 'AsSeparatorLine' + # Define final location of translation file. TRANSLATION=$(dirname $FILE \ | sed -r 's!/trunk/(Identity/)!/trunk/Locales/\1!')/$(cli_getCurrentLocale).po @@ -188,9 +191,6 @@ function identity_renderBase { # Execute post-rendition actions. identity_renderPostActions - # Output separator line. - cli_printMessage '-' 'AsSeparatorLine' - # Verify position of file being produced in the list of files # been currently processed. As convenction, last-rendition # actions are applied after all images inside the same