diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_getConfigOption.sh b/Scripts/Bash/Cli/Functions/Identity/identity_getConfigOption.sh index 2c78ef9..9edb5de 100755 --- a/Scripts/Bash/Cli/Functions/Identity/identity_getConfigOption.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_getConfigOption.sh @@ -17,7 +17,7 @@ # FIELD is the field number in the action string we want to retrive # option from. By default options start from third field on. The first # field is reserved for the action type (i.e., POST or LAST), and the -# second field is reserved for the action itself (e.g., renderFormats, +# second field is reserved for the action itself (e.g., convertPngTo, # renderSyslinux, renderKsplash, etc.). # # Copyright (C) 2009-2011 Alain Reguera Delgado diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_render.sh b/Scripts/Bash/Cli/Functions/Identity/identity_render.sh index 472ded6..01f43d5 100755 --- a/Scripts/Bash/Cli/Functions/Identity/identity_render.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_render.sh @@ -56,9 +56,6 @@ function identity_render { # Verify post-rendition actions passed from command-line and add # them, if any, to post-rendition list of actions. - if [[ $FLAG_CONVERT_TO != '' ]];then - POSTACTIONS[((++${#POSTACTIONS[*]}))]="renderFormats:${FLAG_CONVERT_TO}" - fi if [[ $FLAG_GROUPED_BY != '' ]];then POSTACTIONS[((++${#POSTACTIONS[*]}))]="groupByFormat:${FLAG_GROUPED_BY}" fi diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_renderPostActions.sh b/Scripts/Bash/Cli/Functions/Identity/identity_renderPostActions.sh index 53dd99f..bff2fd2 100755 --- a/Scripts/Bash/Cli/Functions/Identity/identity_renderPostActions.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_renderPostActions.sh @@ -32,10 +32,6 @@ function identity_renderPostActions { case "${ACTION}" in - renderFormats:* ) - identity_convertPngTo - ;; - groupByFormat:* ) identity_groupSimilarFiles ;; diff --git a/Scripts/Bash/Cli/Functions/Identity/identity_renderSvgPostActions.sh b/Scripts/Bash/Cli/Functions/Identity/identity_renderSvgPostActions.sh index bf7a5f9..d4fb302 100644 --- a/Scripts/Bash/Cli/Functions/Identity/identity_renderSvgPostActions.sh +++ b/Scripts/Bash/Cli/Functions/Identity/identity_renderSvgPostActions.sh @@ -33,14 +33,14 @@ function identity_renderSvgPostActions { # post-rendition actions. local -a POSTACTIONS - # Execute SVG-directory-specific post-rendition actions to the + # Execute SVG directory-specific post-rendition actions to the # list of post actions and last actions. This is required in order # to provide a predictable way of producing content inside the # repository and save you the time of writing long option # combinations each time you need to produce images inside the # repository. if [[ $TEMPLATE =~ "Distro/Backgrounds/.+\.svg$" ]];then - POSTACTIONS[((++${#POSTACTIONS[*]}))]='renderFormats: jpg' + POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngTo: jpg' POSTACTIONS[((++${#POSTACTIONS[*]}))]='groupByFormat: png jpg' elif [[ $TEMPLATE =~ "Distro/$(cli_getPathComponent '--release-pattern')/Syslinux/.+\.svg$" ]];then POSTACTIONS[((++${#POSTACTIONS[*]}))]='renderSyslinux' @@ -51,11 +51,22 @@ function identity_renderSvgPostActions { elif [[ $TEMPLATE =~ "Distro/$(cli_getPathComponent '--release-pattern')/Ksplash/.+\.svg$" ]];then POSTACTIONS[((++${#POSTACTIONS[*]}))]='renderKsplash' fi - + + # Execute SVG command-line-specific post-rendition actions passed + # from command-line and add them, if any, to post-rendition list + # of actions. + if [[ $FLAG_CONVERT_TO != '' ]];then + POSTACTIONS[((++${#POSTACTIONS[*]}))]="convertPngTo:${FLAG_CONVERT_TO}" + fi + for ACTION in "${POSTACTIONS[@]}"; do case "${ACTION}" in + convertPngTo:* ) + identity_convertPngTo + ;; + renderSyslinux* ) identity_renderSyslinux ;;