diff --git a/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended.sh b/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended.sh index 0c8a98f..8f7636f 100755 --- a/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended.sh +++ b/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended.sh @@ -42,7 +42,7 @@ function extended { # `16', `24', `32', etc. local HEIGHTS=$(tcar_getConfigValue "${CONFIGURATION}" "${SECTION}" "heights") if [[ -z ${HEIGHTS} ]];then - HEIGHTS="16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512" + HEIGHTS="16 20 22 24 26 32 36 38 40 48 52 64 72 78 96 112 124 128 148 164 196 200 512" fi # Retrieve foreground colors you want to produce the image for. @@ -64,15 +64,15 @@ function extended { BGCOLORS="ffffff-0 ffffff-1" fi - for FGCOLOR in ${FGCOLORS};do + for BGCOLOR in ${BGCOLORS};do - # Verify value passed as foreground color. - tcar_checkFiles -m '^[a-fA-F0-9]{3,6}$' ${FGCOLOR} + # Verify value passed as background color. + tcar_checkFiles -m '^[a-fA-F0-9]{6}-(0|1)$' ${BGCOLOR} - for BGCOLOR in ${BGCOLORS};do + for FGCOLOR in ${FGCOLORS};do - # Verify value passed as background color. - tcar_checkFiles -m '^[a-fA-F0-9]{6}-(0|1)$' ${BGCOLOR} + # Verify value passed as foreground color. + tcar_checkFiles -m '^[a-fA-F0-9]{3,6}$' ${FGCOLOR} for HEIGHT in ${HEIGHTS};do diff --git a/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended_setBaseRendition.sh b/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended_setBaseRendition.sh index b471d0b..2097b22 100755 --- a/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended_setBaseRendition.sh +++ b/Automation/Modules/Render/Modules/Files/Modules/Svg/Modules/Extended/extended_setBaseRendition.sh @@ -28,7 +28,7 @@ function extended_setBaseRendition { - local RENDER_TARGET=$(dirname ${RENDER_TARGET})/${FGCOLOR}/${BGCOLOR}/${HEIGHT}/$(basename ${RENDER_TARGET}) + local RENDER_TARGET=$(dirname ${RENDER_TARGET})/${BGCOLOR}/${FGCOLOR}/${HEIGHT}/$(basename ${RENDER_TARGET}) svg_setBaseRendition