From 9b868686a34903aa52a3e46883fb036dd0d80084 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Apr 30 2011 15:34:41 +0000 Subject: Update `render' functionality: - The groupSimilarFiles action is no longer considered a common last-rendition action, but a common post-rendition action only. --- diff --git a/Scripts/Functions/Render/render_doBaseActions.sh b/Scripts/Functions/Render/render_doBaseActions.sh index 0c84675..04588e0 100755 --- a/Scripts/Functions/Render/render_doBaseActions.sh +++ b/Scripts/Functions/Render/render_doBaseActions.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# render_do.sh -- This function performs base-rendition action -# for all files. +# render_doBaseActions.sh -- This function performs base-rendition +# action for all files. # # Copyright (C) 2009, 2010, 2011 The CentOS Project # @@ -53,12 +53,6 @@ function render_doBaseActions { # Verify default directory where design models are stored in. cli_checkFiles "$(cli_getRepoTLDir)/Identity/Themes/Models/${FLAG_THEME_MODEL}" 'd' - # Verify post-rendition actions passed from command-line and add - # them, if any, to post-rendition list of actions. - if [[ $FLAG_GROUPED_BY != '' ]];then - POSTACTIONS[((++${#POSTACTIONS[*]}))]="groupSimilarFiles:${FLAG_GROUPED_BY}" - fi - # Define the extension pattern for template files. This is the # file extensions that centos-art will look for in order to build # the list of files to process. The list of files to process diff --git a/Scripts/Functions/Render/render_doLastActions.sh b/Scripts/Functions/Render/render_doLastActions.sh index 88bf820..6f9c635 100755 --- a/Scripts/Functions/Render/render_doLastActions.sh +++ b/Scripts/Functions/Render/render_doLastActions.sh @@ -25,28 +25,16 @@ function render_doLastActions { - local ACTION='' - # Verify position of file being produced in the list of files been # currently processed. - if [[ $THIS_FILE_DIR != $NEXT_FILE_DIR ]];then - - # At this point centos-art.sh should be producing the last - # file from the same unique directory structure, so, before - # producing images for the next directory structure lets - # execute last-rendition actions for the current directory - # structure. - for ACTION in "${LASTACTIONS[@]}"; do - - case "${ACTION}" in + if [[ $THIS_FILE_DIR == $NEXT_FILE_DIR ]];then + return + fi - groupSimilarFiles:* ) - render_groupSimilarFiles - ;; - esac + local ACTION='' - done + # Define common last-rendition actions. - fi + # Execute common last-rendition actions. } diff --git a/Scripts/Functions/Render/render_doPostActions.sh b/Scripts/Functions/Render/render_doPostActions.sh index 7684029..e890439 100755 --- a/Scripts/Functions/Render/render_doPostActions.sh +++ b/Scripts/Functions/Render/render_doPostActions.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# render_doPostActions.sh -- This function performs -# post-rendition actions for all files. +# render_doPostActions.sh -- This function performs post-rendition +# actions for all files. # # Copyright (C) 2009, 2010, 2011 The CentOS Project # @@ -27,6 +27,12 @@ function render_doPostActions { local ACTION='' + # Define common post-rendition actions. + if [[ $FLAG_GROUPED_BY != '' ]];then + POSTACTIONS[((++${#POSTACTIONS[*]}))]="groupSimilarFiles:${FLAG_GROUPED_BY}" + fi + + # Execute common post-rendition actions. for ACTION in "${POSTACTIONS[@]}"; do case "${ACTION}" in diff --git a/Scripts/Functions/Render/render_doSvgLastActions.sh b/Scripts/Functions/Render/render_doSvgLastActions.sh index d8783fd..e506aef 100644 --- a/Scripts/Functions/Render/render_doSvgLastActions.sh +++ b/Scripts/Functions/Render/render_doSvgLastActions.sh @@ -25,14 +25,14 @@ function render_doSvgLastActions { - local ACTION='' - # Verify position of file being produced in the list of files been # currently processed. if [[ $THIS_FILE_DIR == $NEXT_FILE_DIR ]];then return fi + local ACTION='' + # Define SVG-directory-specific last-rendition actions processing # as local to this function. Otherwise it may confuse command-line # last-rendition actions.