From 8c13b6a95263285c9fe531f490a55a1a5ef4bb43 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Aug 14 2011 18:58:18 +0000 Subject: Update `render' functionality: - When it be possible, don't use variable expansion on function invocations. That would suppress the tags indexing feature. --- diff --git a/Scripts/Functions/Render/Docbook/docbook.sh b/Scripts/Functions/Render/Docbook/docbook.sh index 1dc3c50..e776abc 100755 --- a/Scripts/Functions/Render/Docbook/docbook.sh +++ b/Scripts/Functions/Render/Docbook/docbook.sh @@ -27,10 +27,10 @@ function docbook { # Initialize absolute path to Xsl directory. This is the location # where customization of XSL tranformations are stored in. - DOCBOOK_STYLES_DIR="${RENDER_BACKEND_DIR}/$(cli_getRepoName ${RENDER_BACKEND} -d)/Styles" + DOCBOOK_STYLES_DIR="${RENDER_BACKEND_DIR}/Docbook/Styles" - ${RENDER_BACKEND}_convertToXhtmlChunk - ${RENDER_BACKEND}_convertToXhtml + docbook_convertToXhtmlChunk + docbook_convertToXhtml # WARNING: There are some issues related to DocBook-to-PDF # transformations that make the whole process not so "clean" as @@ -38,12 +38,12 @@ function docbook { # the need of providing a clean output, PDF transformation is # commented until these issues be corrected. If you have a release # of CentOS greater than 5.5, uncomment this to see what happen. - #${RENDER_BACKEND}_convertToPdf + #docbook_convertToPdf # Perform backend post-rendition. - ${RENDER_BACKEND}_doPostActions + docbook_doPostActions # Perform backend last-rendition. - ${RENDER_BACKEND}_doLastActions + docbook_doLastActions } diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToPdf.sh b/Scripts/Functions/Render/Docbook/docbook_convertToPdf.sh index 22c9d5d..1f4497c 100755 --- a/Scripts/Functions/Render/Docbook/docbook_convertToPdf.sh +++ b/Scripts/Functions/Render/Docbook/docbook_convertToPdf.sh @@ -29,7 +29,7 @@ function docbook_convertToPdf { # Tranform DocBook XML to PDF. - ${RENDER_BACKEND}_convertToPdfFromXml + docbook_convertToPdfFromXml # Tranform DocBook SGML to PDF. if [[ $(cli_getCurrentLocale) =~ '^en' ]];then @@ -42,7 +42,7 @@ function docbook_convertToPdf { # in the msgid field. Such expanded characters are not # recognized by openjade when they are used as source to # produce the PDF output. - ${RENDER_BACKEND}_convertToPdfFromSgml + docbook_convertToPdfFromSgml fi } diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromSgml.sh b/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromSgml.sh index c9a3d1e..0417f47 100755 --- a/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromSgml.sh +++ b/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromSgml.sh @@ -85,7 +85,7 @@ function docbook_convertToPdfFromSgml { $SRC # Prepare style final instance used in transformations. - ${RENDER_BACKEND}_prepareStyles "${DOCBOOK_STYLES_DIR}/docbook2pdf.dsl" + docbook_prepareStyles "${DOCBOOK_STYLES_DIR}/docbook2pdf.dsl" # Verify temporal directory and create it if doesn't exist. if [[ ! -d $TMPDIR ]];then diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh b/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh index 504bab9..b327857 100755 --- a/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh +++ b/Scripts/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh @@ -96,7 +96,7 @@ function docbook_convertToPdfFromXml { local PDF=$(basename ${FILE}).pdf # Prepare XSL final instances used in transformations. - ${RENDER_BACKEND}_prepareStyles "${DOCBOOK_STYLES_DIR}/docbook2fo.xsl" + docbook_prepareStyles "${DOCBOOK_STYLES_DIR}/docbook2fo.xsl" # Verify temporal directory and create it if doesn't exist. if [[ ! -d $TMPDIR ]];then diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh b/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh index 1eeec5d..3d02c15 100755 --- a/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh +++ b/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh @@ -50,7 +50,7 @@ function docbook_convertToXhtml { local DST="${FILE}.xhtml" # Prepare XSL final instances used in transformations. - ${RENDER_BACKEND}_prepareStyles $(cli_getFilesList \ + docbook_prepareStyles $(cli_getFilesList \ ${DOCBOOK_STYLES_DIR} --pattern='.*docbook2xhtml-(single|common)\.xsl') # Transform DocBook XML to XHTML supressing all stderr output. diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh b/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh index 357e5f4..fe2c8fe 100755 --- a/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh +++ b/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh @@ -54,7 +54,7 @@ function docbook_convertToXhtmlChunk { local SRC=${INSTANCE} # Prepare XSL final instances used in transformations. - ${RENDER_BACKEND}_prepareStyles $(cli_getFilesList \ + docbook_prepareStyles $(cli_getFilesList \ ${DOCBOOK_STYLES_DIR} --pattern='.*docbook2xhtml-(chunks|common)\.xsl') # Transform DocBook XML to XHTML supressing all stderr output. diff --git a/Scripts/Functions/Render/Docbook/docbook_doPostActions.sh b/Scripts/Functions/Render/Docbook/docbook_doPostActions.sh index d53e2e2..d858b60 100755 --- a/Scripts/Functions/Render/Docbook/docbook_doPostActions.sh +++ b/Scripts/Functions/Render/Docbook/docbook_doPostActions.sh @@ -26,6 +26,6 @@ function docbook_doPostActions { - ${RENDER_BACKEND}_convertToText + docbook_convertToText } diff --git a/Scripts/Functions/Render/Svg/svg.sh b/Scripts/Functions/Render/Svg/svg.sh index 9c6a281..0419479 100755 --- a/Scripts/Functions/Render/Svg/svg.sh +++ b/Scripts/Functions/Render/Svg/svg.sh @@ -30,7 +30,7 @@ function svg { local EXPORTID='CENTOSARTWORK' # Verify the export id. - ${RENDER_BACKEND}_checkModelExportId "$INSTANCE" "$EXPORTID" + svg_checkModelExportId "$INSTANCE" "$EXPORTID" # Check existence of external files. Inside design templates and # their instances, external files are used to refere the @@ -38,7 +38,7 @@ function svg { # background information is not available the image is produced # without background information. This is something that need to # be avoided. - ${RENDER_BACKEND}_checkModelAbsref "$INSTANCE" + svg_checkModelAbsref "$INSTANCE" # Render template instance using inkscape and save the output. local INKSCAPE_OUTPUT="$(\ @@ -54,9 +54,9 @@ function svg { | sed -r "s!^Bitmap saved as:!`gettext "Saved as"`:!")" # Perform backend post-rendition. - ${RENDER_BACKEND}_doPostActions + svg_doPostActions # Perform backend last-rendition. - ${RENDER_BACKEND}_doLastActions + svg_doLastActions } diff --git a/Scripts/Functions/Render/Svg/svg_checkModelAbsref.sh b/Scripts/Functions/Render/Svg/svg_checkModelAbsref.sh index a980298..8ef23e7 100755 --- a/Scripts/Functions/Render/Svg/svg_checkModelAbsref.sh +++ b/Scripts/Functions/Render/Svg/svg_checkModelAbsref.sh @@ -90,10 +90,10 @@ function svg_checkModelAbsref { if [[ ! -f $BG_SRC_FILE ]];then # Define plain color that will be used as background. - BG_SRC_FILE_COLOR=$(${RENDER_BACKEND}_getColors) + BG_SRC_FILE_COLOR=$(svg_getColors) # Verify format of color value. - ${RENDER_BACKEND}_checkColorFormats $BG_SRC_FILE_COLOR --format='rrggbb' + svg_checkColorFormats $BG_SRC_FILE_COLOR --format='rrggbb' # Define width for the source background file the # required background information is cropped from. diff --git a/Scripts/Functions/Render/Svg/svg_convertGplToHex.sh b/Scripts/Functions/Render/Svg/svg_convertGplToHex.sh index 77d382a..48aa47e 100755 --- a/Scripts/Functions/Render/Svg/svg_convertGplToHex.sh +++ b/Scripts/Functions/Render/Svg/svg_convertGplToHex.sh @@ -40,16 +40,16 @@ function svg_convertGplToHex { local NUMBER="$3" # Define list of colors from GPL palette. - local COLORS=$(${RENDER_BACKEND}_getColors $PALETTE_GPL --head=$NUMBER --tail=$NUMBER) + local COLORS=$(svg_getColors $PALETTE_GPL --head=$NUMBER --tail=$NUMBER) # Verify number of colors returned in the list. They must match # exactly the amount specified, no more no less. Sometimes, the # list of colors may have less colors than it should have, so we # need to prevent such palettes from being used. - ${RENDER_BACKEND}_checkColorAmount "$COLORS" "$NUMBER" + svg_checkColorAmount "$COLORS" "$NUMBER" # Verify format of colors. - ${RENDER_BACKEND}_checkColorFormats "$COLORS" --format='rrggbb' + svg_checkColorFormats "$COLORS" --format='rrggbb' # Create list of colors to be processed by `pnmtolss16'. echo "$COLORS" | nl | gawk '{ printf "%s=%d ", $2, $1 - 1 }' \ diff --git a/Scripts/Functions/Render/Svg/svg_convertGplToPpm.sh b/Scripts/Functions/Render/Svg/svg_convertGplToPpm.sh index 6888267..a79ef38 100755 --- a/Scripts/Functions/Render/Svg/svg_convertGplToPpm.sh +++ b/Scripts/Functions/Render/Svg/svg_convertGplToPpm.sh @@ -42,13 +42,13 @@ function svg_convertGplToPpm { # Define list of colors from GPL palette. local COLOR='' - local COLORS=$(${RENDER_BACKEND}_getColors "$PALETTE_GPL" --head=$NUMBER --tail=$NUMBER --format='rrrggbb') + local COLORS=$(svg_getColors "$PALETTE_GPL" --head=$NUMBER --tail=$NUMBER --format='rrrggbb') # Verify amount of colors in the list of colors. - ${RENDER_BACKEND}_checkColorAmount "$COLORS" "$NUMBER" + svg_checkColorAmount "$COLORS" "$NUMBER" # Verify format of colors. - ${RENDER_BACKEND}_checkColorFormats $COLORS --format='rrggbb' + svg_checkColorFormats $COLORS --format='rrggbb' # Create temporal images (of 1x1 pixel each) to store each color # retrived from Gimp's palette. diff --git a/Scripts/Functions/Render/Svg/svg_convertPngTo.sh b/Scripts/Functions/Render/Svg/svg_convertPngTo.sh index c7ca7e2..1216e10 100755 --- a/Scripts/Functions/Render/Svg/svg_convertPngTo.sh +++ b/Scripts/Functions/Render/Svg/svg_convertPngTo.sh @@ -27,7 +27,7 @@ function svg_convertPngTo { # Initialize image formats. local FORMAT='' - local FORMATS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2') + local FORMATS=$(render_getConfigOption "$ACTION" '2') # Convert from PNG to specified formats. for FORMAT in $FORMATS;do diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh b/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh index 3fa4b95..a2dd443 100755 --- a/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh +++ b/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh @@ -37,7 +37,7 @@ function svg_convertPngToDm { local DST='' # Initialize display manager type. - local DM=$(${CLI_FUNCNAME}_getConfigOption "${ACTION}" '2') + local DM=$(render_getConfigOption "${ACTION}" '2') # Initialize screen resolutions used by display manager theme. # These are the different screen resolutions a display manager @@ -46,7 +46,7 @@ function svg_convertPngToDm { # background files provided by the artistic motif used to build # the display manager theme. local RESOLUTION='' - local RESOLUTIONS=$(${CLI_FUNCNAME}_getConfigOption "${ACTION}" '3') + local RESOLUTIONS=$(render_getConfigOption "${ACTION}" '3') # Verify screen resolutions. We cannot produce display manager # theme if no screen resolution has been specified. diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh b/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh index 189f490..4ecdf4e 100755 --- a/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh +++ b/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh @@ -64,7 +64,7 @@ function svg_convertPngToGrub { # configuration script. These options are applied to pnmremap when # doing color reduction, so any option available for pnmremap # command can be passed to renderSyslinux functionality. - local OPTIONS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-') + local OPTIONS=$(render_getConfigOption "$ACTION" '2-') # Check options passed to action. This is required in order to # aviod using options used already in this script. For example @@ -119,7 +119,7 @@ function svg_convertPngToGrub { cli_printMessage "$PALETTE_GPL" --as-palette-line # Create PPM palette using GPL palette. - ${RENDER_BACKEND}_convertGplToPpm "$PALETTE_GPL" "$PALETTE_PPM" "$COLORS" + svg_convertGplToPpm "$PALETTE_GPL" "$PALETTE_PPM" "$COLORS" # Reduce colors as specified in PPM palette. Here we use the PPM # palette to enforce the color position in the image index and the diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh b/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh index 116df13..548cb21 100755 --- a/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh +++ b/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh @@ -73,7 +73,7 @@ function svg_convertPngToSyslinux { # configuration script. These options are applied to pnmremap when # doing color reduction, so any option available for pnmremap # command can be passed to renderSyslinux functionality. - local OPTIONS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-') + local OPTIONS=$(render_getConfigOption "$ACTION" '2-') # Check options passed to action. This is required in order to # aviod using options already used in this script. For example @@ -142,10 +142,10 @@ function svg_convertPngToSyslinux { cli_printMessage "$PALETTE_GPL" --as-palette-line # Create PPM palette using GPL palette. - ${RENDER_BACKEND}_convertGplToPpm "$PALETTE_GPL" "$PALETTE_PPM" "$COLORS" + svg_convertGplToPpm "$PALETTE_GPL" "$PALETTE_PPM" "$COLORS" # Create HEX palette using GPL palette. - ${RENDER_BACKEND}_convertGplToHex "$PALETTE_GPL" "$PALETTE_HEX" "$COLORS" + svg_convertGplToHex "$PALETTE_GPL" "$PALETTE_HEX" "$COLORS" # Reduce colors as specified in PPM palette. Here we use the PPM # palette to enforce the color position in the image index and the diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh b/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh index cfbe744..6e319e2 100755 --- a/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh +++ b/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh @@ -31,7 +31,7 @@ function svg_convertPngToThumbnail { # Get image size. local SIZE='' - local SIZES=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-') + local SIZES=$(render_getConfigOption "$ACTION" '2-') # Check image sizes and do convertion. if [[ "$SIZES" == "" ]];then diff --git a/Scripts/Functions/Render/Svg/svg_doLastActions.sh b/Scripts/Functions/Render/Svg/svg_doLastActions.sh index 2c75847..f28eef6 100755 --- a/Scripts/Functions/Render/Svg/svg_doLastActions.sh +++ b/Scripts/Functions/Render/Svg/svg_doLastActions.sh @@ -66,7 +66,7 @@ function svg_doLastActions { # images for the next directory structure lets execute the list of # last-rendition actions for the current directory structure. for ACTION in "${LASTACTIONS[@]}"; do - ${RENDER_BACKEND}_$(echo "$ACTION" | cut -d: -f1) + svg_$(echo "$ACTION" | cut -d: -f1) done } diff --git a/Scripts/Functions/Render/Svg/svg_doLastCommand.sh b/Scripts/Functions/Render/Svg/svg_doLastCommand.sh index 4cd23cd..eae59b9 100755 --- a/Scripts/Functions/Render/Svg/svg_doLastCommand.sh +++ b/Scripts/Functions/Render/Svg/svg_doLastCommand.sh @@ -29,12 +29,12 @@ function svg_doLastCommand { # Define the file extensions. This value is a regular expression # pattern which must match the file extensions that last-rendition # actions will be applied to. - local EXTENSION=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2') + local EXTENSION=$(render_getConfigOption "$ACTION" '2') # Define the command string that will be evaluated as # last-rendition action. Only commands that perform in-place # modifications can be passed here. - local COMMAND=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '3-') + local COMMAND=$(render_getConfigOption "$ACTION" '3-') # Define the list of files to process. This value contain all the # files in the output directory which extension match the diff --git a/Scripts/Functions/Render/Svg/svg_doPostActions.sh b/Scripts/Functions/Render/Svg/svg_doPostActions.sh index 99a885b..1a10b2f 100755 --- a/Scripts/Functions/Render/Svg/svg_doPostActions.sh +++ b/Scripts/Functions/Render/Svg/svg_doPostActions.sh @@ -88,7 +88,7 @@ function svg_doPostActions { # Execute SVG post-rendition actions. for ACTION in "${POSTACTIONS[@]}"; do - ${RENDER_BACKEND}_$(echo "$ACTION" | cut -d: -f1) + svg_$(echo "$ACTION" | cut -d: -f1) done } diff --git a/Scripts/Functions/Render/Svg/svg_doPostCommand.sh b/Scripts/Functions/Render/Svg/svg_doPostCommand.sh index ae15ed7..10c7f4b 100755 --- a/Scripts/Functions/Render/Svg/svg_doPostCommand.sh +++ b/Scripts/Functions/Render/Svg/svg_doPostCommand.sh @@ -26,10 +26,10 @@ function svg_doPostCommand { # Define the file extension of base-rendition output. - local EXTENSION=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2') + local EXTENSION=$(render_getConfigOption "$ACTION" '2') # Define the command string. - local COMMAND=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '3-') + local COMMAND=$(render_getConfigOption "$ACTION" '3-') # Verify the absolute path of base-rendition output. cli_checkFiles ${FILE}.${EXTENSION} diff --git a/Scripts/Functions/Render/Svg/svg_getColors.sh b/Scripts/Functions/Render/Svg/svg_getColors.sh index e60bae3..f4dd076 100755 --- a/Scripts/Functions/Render/Svg/svg_getColors.sh +++ b/Scripts/Functions/Render/Svg/svg_getColors.sh @@ -110,9 +110,9 @@ function svg_getColors { # of them is present, use The CentOS Project default color # then. if [[ -f $MOTIF_PALETTE ]];then - COLORS=$(${RENDER_BACKEND}_getColors $MOTIF_PALETTE --head=1 --tail=1) + COLORS=$(svg_getColors $MOTIF_PALETTE --head=1 --tail=1) elif [[ -f $MODEL_PALETTE ]];then - COLORS=$(${RENDER_BACKEND}_getColors $MODEL_PALETTE --head=1 --tail=1) + COLORS=$(svg_getColors $MODEL_PALETTE --head=1 --tail=1) else COLORS='#204c8d' fi diff --git a/Scripts/Functions/Render/Svg/svg_groupBy.sh b/Scripts/Functions/Render/Svg/svg_groupBy.sh index 273765c..1e747d8 100755 --- a/Scripts/Functions/Render/Svg/svg_groupBy.sh +++ b/Scripts/Functions/Render/Svg/svg_groupBy.sh @@ -39,7 +39,7 @@ function svg_groupBy { # Sanitate file types passed from render.conf.sh pre-rendition # configuration script. local FORMAT='' - local FORMATS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-') + local FORMATS=$(render_getConfigOption "$ACTION" '2-') for FORMAT in $FORMATS;do diff --git a/Scripts/Functions/Render/render.sh b/Scripts/Functions/Render/render.sh index 538e41f..eeebf90 100755 --- a/Scripts/Functions/Render/render.sh +++ b/Scripts/Functions/Render/render.sh @@ -89,7 +89,7 @@ function render { local RENDER_EXTENSIONS='svg docbook' # Interpret arguments and options passed through command-line. - ${CLI_FUNCNAME}_getOptions + render_getOptions # Redefine positional parameters using ARGUMENTS. At this point, # option arguments have been removed from ARGUMENTS variable and @@ -116,11 +116,11 @@ function render { # take the action value (ACTIONVAL) as reference and describe # the production through an action name (ACTIONNAM). if [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Identity/Images/Themes" ]];then - ACTIONNAM="${CLI_FUNCNAME}_doThemeActions" + ACTIONNAM="render_doThemeActions" elif [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Identity/Images" ]];then - ACTIONNAM="${CLI_FUNCNAME}_doBaseActions" + ACTIONNAM="render_doBaseActions" elif [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Manuals" ]];then - ACTIONNAM="${CLI_FUNCNAME}_doBaseActions" + ACTIONNAM="render_doBaseActions" else cli_printMessage "`gettext "The path provided does not support rendition."`" --as-error-line fi diff --git a/Scripts/Functions/Render/render_doBaseActions.sh b/Scripts/Functions/Render/render_doBaseActions.sh index a9c32f2..cb493fc 100755 --- a/Scripts/Functions/Render/render_doBaseActions.sh +++ b/Scripts/Functions/Render/render_doBaseActions.sh @@ -46,17 +46,15 @@ function render_doBaseActions { PARENTDIR=$(basename "${ACTIONVAL}") # Define base location of template files. - ${CLI_FUNCNAME}_getDirTemplate + render_getDirTemplate # Loop through list of supported file extensions. for RENDER_EXTENSION in ${RENDER_EXTENSIONS};do # Redefine name of rendition backend based on supported file # extension. - if [[ $RENDER_EXTENSION == 'svg' ]];then - RENDER_BACKEND='svg' - elif [[ $RENDER_EXTENSION == 'docbook' ]];then - RENDER_BACKEND='docbook' + if [[ $RENDER_EXTENSION == '^(svg|docbook)$' ]];then + RENDER_BACKEND=${RENDER_EXTENSION} else cli_printMessage "`eval_gettext "The \\\"\\\$RENDER_EXTENSION\\\" file extension is not supported yet."`" --as-error-line fi @@ -178,7 +176,7 @@ function render_doBaseActions { fi # Define final location of output directory. - ${CLI_FUNCNAME}_getDirOutput + render_getDirOutput # Get relative path to file. The path string (stored in # FILE) has two parts: 1. the variable path and 2. the @@ -220,7 +218,7 @@ function render_doBaseActions { # Apply translation file to design model to produce the design # model translated instance. - ${CLI_FUNCNAME}_doTranslation + render_doTranslation # Expand translation markers inside design model instance. cli_expandTMarkers ${INSTANCE} diff --git a/Scripts/Functions/Render/render_doThemeActions.sh b/Scripts/Functions/Render/render_doThemeActions.sh index a6c4be9..df0db5e 100755 --- a/Scripts/Functions/Render/render_doThemeActions.sh +++ b/Scripts/Functions/Render/render_doThemeActions.sh @@ -125,7 +125,7 @@ function render_doThemeActions { # Execute direct rendition on theme specific renderable # directory as specified by action value. - ${CLI_FUNCNAME}_doBaseActions + render_doBaseActions # Increment counter to match the correct count value. COUNT=$(($COUNT + 1))