From fa87040c4f8e08f50d5cf0c940e2a1279308caaf Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Feb 20 2011 07:07:00 +0000 Subject: Update function and path names inside `identity' functionality. --- diff --git a/Scripts/Bash/Functions/Identity/identity_do.sh b/Scripts/Bash/Functions/Identity/identity_do.sh index 7a2c18d..3c6ef6f 100755 --- a/Scripts/Bash/Functions/Identity/identity_do.sh +++ b/Scripts/Bash/Functions/Identity/identity_do.sh @@ -1,10 +1,10 @@ #!/bin/bash # -# identity_do.sh -- This function initiates rendition -# configuration functions and executes them to perform the rendition -# action specified in the `ACTIONS' array variable. Function -# initialization and execution is based on the absolute path -# convenction defined by ARTCONF variable. +# identity_do.sh -- This function initiates rendition configuration +# functions and executes them to perform the rendition action +# specified in the `ACTIONS' array variable. Function initialization +# and execution is based on the absolute path convenction defined by +# ARTCONF variable. # # Copyright (C) 2009-2011 Alain Reguera Delgado # @@ -75,7 +75,7 @@ function identity_do { # the exact artwork path (that is, where images will be # stored). ACTIONVAL=$(dirname $(echo $FILE | sed -r \ - -e 's!Scripts/Bash/Functions/Render/Config/(Identity)/!\1/!' \ + -e 's!Scripts/Bash/Functions/Identity/Config/(Identity)/!\1/!' \ -e "s!Themes/!Themes/Motifs/$(cli_getPathComponent '--theme')/!")) # Redefine artwork identification using redefined action diff --git a/Scripts/Bash/Functions/Identity/identity_getActions.sh b/Scripts/Bash/Functions/Identity/identity_getActions.sh index 67916e9..f914c54 100644 --- a/Scripts/Bash/Functions/Identity/identity_getActions.sh +++ b/Scripts/Bash/Functions/Identity/identity_getActions.sh @@ -47,7 +47,7 @@ function identity_getActions { --render ) # Redefine action name. - ACTIONNAM="${FUNCNAM}_doIdentity" + ACTIONNAM="${FUNCNAM}_do" # Redefine action value. ACTIONVAL="$2" @@ -123,7 +123,7 @@ function identity_getActions { # scripts. The render.conf.sh script defines how each identity # content is rendered. local ARTCONF=$(echo "$ACTIONVAL" \ - | sed -r -e 's!/(Identity)!/Scripts/Bash/Functions/Render/Config/\1!' \ + | sed -r -e 's!/(Identity)!/Scripts/Bash/Functions/Identity/Config/\1!' \ -e "s!Motifs/$(cli_getPathComponent '--theme')/?!!") # Check directory of pre-rendition configuration script.