diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh index a1f1ca8..e1c378b 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh @@ -88,7 +88,7 @@ function render_doIdentityImages { --export-png=$FILE.png \ | sed -r -e "s!Area !`gettext "Area"`: !" \ -e "s!Background RRGGBBAA:!`gettext "Background"`: RRGGBBAA!" \ - -e "s!Bitmap saved as:.+/trunk/!`gettext "Saved as"`: trunk/!" + -e "s!Bitmap saved as:.+/(trunk|branches|tags)/!`gettext "Saved as"`: \1/!" # Remove template instance. if [[ -a $INSTANCE ]];then diff --git a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh index ac24e83..fbc069a 100755 --- a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh +++ b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh @@ -81,9 +81,9 @@ function render_getActionsIdentity { # configuration script path value. Otherwise massive rendering # may fail. Functions like renderImage need to know the exact # artwork path (that is, where images will be stored). - OPTIONVAL=$(dirname $(echo $FILE \ - | sed -r 's!Scripts/Bash/Functions/Render/Config/Identity/!Identity/!' \ - | sed -r "s!Themes/!Themes/Motifs/$(cli_getThemeName)/!")) + OPTIONVAL=$(dirname $(echo $FILE | sed -r \ + -e 's!Scripts/Bash/Functions/Render/Config/Identity/!Identity/!' \ + -e "s!Themes/!Themes/Motifs/$(cli_getThemeName)/!")) # Re-define artwork identification. ARTCOMP=$(echo $OPTIONVAL | cut -d/ -f6-) diff --git a/Scripts/Bash/Functions/cli_getThemeName.sh b/Scripts/Bash/Functions/cli_getThemeName.sh index 970bdfd..351b0de 100755 --- a/Scripts/Bash/Functions/cli_getThemeName.sh +++ b/Scripts/Bash/Functions/cli_getThemeName.sh @@ -29,9 +29,9 @@ function cli_getThemeName { local THEMENAME='' - if [[ $OPTIONVAL =~ '^.+/Themes/Motifs/([A-Za-z0-9-]+)+/.+$' ]];then + if [[ $OPTIONVAL =~ '^.+/Themes/Motifs/([A-Za-z0-9-]+)/.+$' ]];then THEMENAME=$(echo $OPTIONVAL \ - | sed -r 's!^.+/Themes/Motifs/([A-Za-z0-9-]+)+/.+!\1!') + | sed -r "s!^.+/Themes/Motifs/([A-Za-z0-9-]+(/${RELEASE_FORMAT})?)/.+!\1!") fi echo $THEMENAME diff --git a/Scripts/Bash/Functions/cli_printMessage.sh b/Scripts/Bash/Functions/cli_printMessage.sh index c25f313..ab2d850 100755 --- a/Scripts/Bash/Functions/cli_printMessage.sh +++ b/Scripts/Bash/Functions/cli_printMessage.sh @@ -37,7 +37,8 @@ function cli_printMessage { # Reduce paths inside output messages. The main purpose for this # is to free horizontal space in output messages. - MESSAGE=$(echo "$MESSAGE" | sed -r 's!/home/centos/artwork/trunk/!trunk/!') + MESSAGE=$(echo "$MESSAGE" \ + | sed -r 's!/home/centos/artwork/(trunk|branches|tags)/!\1/!') # Remove blank spaces from lines' begining. MESSAGE=$(echo "$MESSAGE" | sed -r 's!^[[:space:]]+!!')