diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh b/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh index 36c9be7..abb110b 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImageGrub.sh @@ -45,7 +45,7 @@ function render_doIdentityImageGrub { # GRUB's 14 colors image (splash.png) rendering. If there is no # palette available, do not apply color reduction, show a message, # and continue. - cli_checkFiles "$PALETTE_PPM" '' '' + cli_checkFiles $PALETTE_PPM # Create Netpbm superformat (PNM). PNM file is created from the # PNG image rendered previously. PNM is a common point for image diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImageKsplash.sh b/Scripts/Bash/Functions/Render/render_doIdentityImageKsplash.sh index f0bdae5..13720eb 100755 --- a/Scripts/Bash/Functions/Render/render_doIdentityImageKsplash.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImageKsplash.sh @@ -50,11 +50,10 @@ function render_doIdentityImageKsplash { fi # Check required image files existence. - cli_checkFiles "$KSPLASH_PREVIEW - $KSPLASH_ACTIVE_BAR - $KSPLASH_BOTTOM - $KSPLASH_PREVIEW_FONT - " 'f' + cli_checkFiles $KSPLASH_PREVIEW + cli_checkFiles $KSPLASH_ACTIVE_BAR + cli_checkFiles $KSPLASH_BOTTOM + cli_checkFiles $KSPLASH_PREVIEW_FONT # Create Preview.png image. convert -append \ diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh b/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh index ef72adf..84a52a1 100755 --- a/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImageSyslinux.sh @@ -50,8 +50,8 @@ function render_doIdentityImageSyslinux { # automate the syslinux's 16 colors image (syslinux-splash.png) # rendering. If there is no palette available, do not apply color # reduction, show a message, and continue. - cli_checkFiles "$PALETTE_PPM - $PALETTE_HEX" '' '' + cli_checkFiles $PALETTE_PPM + cli_checkFiles $PALETTE_HEX # Create Netpbm superformat (PNM). PNM file is created from the # PNG image rendered previously. PNM is a common point for image diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh index e9490d1..a1f1ca8 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh @@ -28,6 +28,7 @@ function render_doIdentityImages { local EXPORTID='' local EXTERNALFILES='' + local EXTERNALFILE='' # Export id used inside design templates. This value defines the # design area we want to export. @@ -75,7 +76,9 @@ function render_doIdentityImages { | sed -r 's!^[[:space:]]+!!' \ | sed -r 's!^(xlink:href|sodipodi:absref)="!!' \ | sed -r 's!".*$!!' | uniq) - cli_checkFiles "$EXTERNALFILES" '' '' + for EXTERNALFILE in $EXTERNALFILES;do + cli_checkFiles $EXTERNALFILE + done # Render template instance and modify the inkscape output to # reduce the amount of characters used in description column diff --git a/Scripts/Bash/Functions/Render/render_getIdentityDefs.sh b/Scripts/Bash/Functions/Render/render_getIdentityDefs.sh index 51328d8..7fd7cd3 100644 --- a/Scripts/Bash/Functions/Render/render_getIdentityDefs.sh +++ b/Scripts/Bash/Functions/Render/render_getIdentityDefs.sh @@ -285,10 +285,13 @@ function render_getIdentityDefs { ".*/${TEMPLATE}" | sort | head -n 1) fi - # Check existence of TEMPLATE file. Show design template being - # used or stop running, we cannot continue if the provided - # template doesn't exist. + # Check existence of TEMPLATE file. If design template doesn't + # exist we cannot render it; in such case, stop working for it and + # try the next one in the list. cli_checkFiles "$TEMPLATE" '' "`gettext "Design"`" + if [[ $? -gt 0 ]];then + continue + fi # Get relative path to file. The path string (stored in FILE) has # two parts: 1. the variable path and 2. the common path. The diff --git a/Scripts/Bash/Functions/Render/render_getIdentityTranslationDir.sh b/Scripts/Bash/Functions/Render/render_getIdentityTranslationDir.sh index 09ceef7..6eaf9c9 100644 --- a/Scripts/Bash/Functions/Render/render_getIdentityTranslationDir.sh +++ b/Scripts/Bash/Functions/Render/render_getIdentityTranslationDir.sh @@ -28,7 +28,7 @@ function render_getIdentityTranslationDir { - TRANSLATIONPATH=${REPO_PATHS[5]}/$ARTCOMP + TRANSLATIONPATH=/home/centos/artwork/trunk/Translations/$ARTCOMP if [[ "$(find $TRANSLATIONPATH -name '*.sed')" == '' ]];then TRANSLATIONPATH=''