From 67e2d77c0e38341de60c643f5d99689d8e605d24 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Dec 27 2013 00:54:53 +0000 Subject: Update prepare_setWorkplace.sh file. - Previously, when printing the action message related to deleting the current workplace, the option --as-removing-line was used. This update is not recognized by tcar_printMessage function. This update changes prepare_setWorkplace.sh to use --as-deleting-line, instead. - Previously, when the prepare_setRenderEnvironment function was called, an absolute path was used. Since the absolute path is outside the CentOS Artwork Repository, it is considered a relative path of it and image rendition fails with a "doesn't exist" error message. This update changes prepare_setWorkplace.sh to remove the absolute part of the path passed to prepare_setRenderEnvironment and use the relative part of it, only. --- diff --git a/tcar-scripts-prepare/prepare_setWorkplace.sh b/tcar-scripts-prepare/prepare_setWorkplace.sh index 4ff5cb6..798bf44 100755 --- a/tcar-scripts-prepare/prepare_setWorkplace.sh +++ b/tcar-scripts-prepare/prepare_setWorkplace.sh @@ -35,7 +35,7 @@ function prepare_setWorkplace { if [[ -d ${TCAR_WORKDIR} ]];then tcar_printMessage "`gettext "The workplace you provided already exist and will be removed."`" --as-stdout-line tcar_printMessage "`gettext "Do you want to continue?"`" --as-yesornorequest-line - tcar_printMessage "${TCAR_WORKDIR}" --as-removing-line + tcar_printMessage "${TCAR_WORKDIR}" --as-deleting-line rm -r ${TCAR_WORKDIR} fi @@ -51,7 +51,7 @@ function prepare_setWorkplace { if [[ -d ${TCAR_WORKDIR}/Brands ]];then tcar_printMessage "`gettext "The workplace doesn't include images for branding other images."`" --as-stdout-line tcar_printMessage "`gettext "Do you want to render them now?"`" --as-yesornorequest-line - prepare_setRenderEnvironment -o "render-type" -v "svg" ${TCAR_WORKDIR}/Brands + prepare_setRenderEnvironment -o "render-type" -v "svg" Brands fi }