From e92b2344a76da93cfddfb86205fb532b74825f8f Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Oct 14 2010 03:25:15 +0000 Subject: * Update path to output_forTwoColumns.awk inside function files. * Add the case AsConfigurationLine to cli_printMessage. --- diff --git a/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh index 094fbbc..d346342 100755 --- a/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh @@ -147,5 +147,5 @@ function render_loadConfig { done done \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk } diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh index 72ec950..6a46bfd 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh @@ -127,7 +127,7 @@ function render_doIdentityImages { echo '----------------------------------------------------------------------' done \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk # Execute post-rendering actions. for ACTION in "${LASTACTIONS[@]}"; do diff --git a/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh b/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh index 309b0a6..89fedfa 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh @@ -58,7 +58,7 @@ function render_doIdentityTexts { echo '----------------------------------------------------------------------' done \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk # Execute last-rendering actions. #for ACTION in "${LASTACTIONS[@]}"; do diff --git a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh index e9542cb..9438b74 100755 --- a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh +++ b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh @@ -57,8 +57,7 @@ function render_getActionsIdentity { for FILE in $(find $ARTCONF -name 'render.conf.sh');do # Output action message. - cli_printMessage "`gettext "Configuration"`: $FILE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + cli_printMessage $FILE 'AsConfigurationLine' echo '----------------------------------------------------------------------' # Define artwork-specific action arrays. We need to do this diff --git a/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh b/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh index 1354738..c2f504a 100755 --- a/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh +++ b/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh @@ -187,5 +187,5 @@ function render_getActionsTranslations { done done \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk } diff --git a/Scripts/Bash/Functions/cli_printMessage.sh b/Scripts/Bash/Functions/cli_printMessage.sh index 0aff79a..9ce0731 100755 --- a/Scripts/Bash/Functions/cli_printMessage.sh +++ b/Scripts/Bash/Functions/cli_printMessage.sh @@ -74,42 +74,47 @@ function cli_printMessage { 'AsUpdatingLine' ) echo "`gettext "Updating"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsRemovingLine' ) echo "`gettext "Removing"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsCheckingLine' ) echo "`gettext "Checking"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsCreatingLine' ) echo "`gettext "Creating"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsSavedAsLine' ) echo "`gettext "Saved as"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsLinkToLine' ) echo "`gettext "Linked to"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsMovedToLine' ) echo "`gettext "Moved to"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsTranslationLine' ) echo "`gettext "Translation"`: $MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk + ;; + + 'AsConfigurationLine' ) + echo "`gettext "Configuration"`: $MESSAGE" \ + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; 'AsResponseLine' ) @@ -144,7 +149,7 @@ function cli_printMessage { 'AsRegularLine' ) echo "$MESSAGE" \ - | awk -f /home/centos/artwork/trunk/Scripts/Bash/Functions/Render/Styles/output_forRendering.awk + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Styles/output_forTwoColumns.awk ;; * )