From ad3ecddf014df64a2b69a907e5d78fde0c174d8e Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Feb 20 2011 16:58:56 +0000 Subject: Rename identity_getBase to identity_renderBase inside `identity' functionality. --- diff --git a/Scripts/Bash/Functions/Identity/identity_getBase.sh b/Scripts/Bash/Functions/Identity/identity_getBase.sh deleted file mode 100755 index cc2ad36..0000000 --- a/Scripts/Bash/Functions/Identity/identity_getBase.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -# -# identity_getBase.sh -- This function initiates rendition features -# taking BASEACTIONS as reference. -# -# Copyright (C) 2009-2011 Alain Reguera Delgado -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. -# -# ---------------------------------------------------------------------- -# $Id$ -# ---------------------------------------------------------------------- - -function identity_getBase { - - local FILES='' - local PARENTDIR='' - local TEMPLATE='' - local COMMONDIR='' - local COMMONDIRCOUNT=0 - local -a COMMONDIRS - - # Redefine parent directory for current workplace. - PARENTDIR=$(basename "$ACTIONVAL") - - # Define base location of template files. - identity_getDirTemplate - - # Define list of files to process. - FILES=$(cli_getFilesList "${TEMPLATE}" "${FLAG_FILTER}.*\.(svgz|svg)") - - # Set action preamble. - # Do not print action preamble here, it prevents massive rendition. - - # Define common absolute paths in order to know when centos-art.sh - # is leaving a directory structure and entering into another. This - # information is required in order for centos-art.sh to know when - # to apply last-rendition actions. - for COMMONDIR in $(dirname "$FILES" | sort | uniq);do - COMMONDIRS[$COMMONDIRCOUNT]=$(dirname "$COMMONDIR") - COMMONDIRCOUNT=$(($COMMONDIRCOUNT + 1)) - done - - # Execute base-rendition action. - identity_renderImages - -} diff --git a/Scripts/Bash/Functions/Identity/identity_render.sh b/Scripts/Bash/Functions/Identity/identity_render.sh index 479ff6e..15a2d20 100755 --- a/Scripts/Bash/Functions/Identity/identity_render.sh +++ b/Scripts/Bash/Functions/Identity/identity_render.sh @@ -89,9 +89,9 @@ function identity_render { ARTCOMP=$(echo $ARTCOMP \ | sed -r "s!Themes/Motifs/$(cli_getPathComponent '--theme')/!Themes/!") - # Start rendition as defined in artwork-specific pre-rendition - # configuration file. - identity_getBase + # Initiate base rendition using pre-rendition configuration + # files. + identity_renderBase # Unset artwork-specific actions so they can be redefined by # artwork-specific pre-rendition configuration scripts. This diff --git a/Scripts/Bash/Functions/Identity/identity_renderBase.sh b/Scripts/Bash/Functions/Identity/identity_renderBase.sh new file mode 100755 index 0000000..a48d71a --- /dev/null +++ b/Scripts/Bash/Functions/Identity/identity_renderBase.sh @@ -0,0 +1,60 @@ +#!/bin/bash +# +# identity_renderBase.sh -- This function initiates base rendition +# using pre-rendition configuration files. +# +# Copyright (C) 2009-2011 Alain Reguera Delgado +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. +# +# ---------------------------------------------------------------------- +# $Id$ +# ---------------------------------------------------------------------- + +function identity_renderBase { + + local FILES='' + local PARENTDIR='' + local TEMPLATE='' + local COMMONDIR='' + local COMMONDIRCOUNT=0 + local -a COMMONDIRS + + # Redefine parent directory for current workplace. + PARENTDIR=$(basename "$ACTIONVAL") + + # Define base location of template files. + identity_getDirTemplate + + # Define list of files to process. + FILES=$(cli_getFilesList "${TEMPLATE}" "${FLAG_FILTER}.*\.(svgz|svg)") + + # Set action preamble. + # Do not print action preamble here, it prevents massive rendition. + + # Define common absolute paths in order to know when centos-art.sh + # is leaving a directory structure and entering into another. This + # information is required in order for centos-art.sh to know when + # to apply last-rendition actions. + for COMMONDIR in $(dirname "$FILES" | sort | uniq);do + COMMONDIRS[$COMMONDIRCOUNT]=$(dirname "$COMMONDIR") + COMMONDIRCOUNT=$(($COMMONDIRCOUNT + 1)) + done + + # Execute base-rendition action. + identity_renderImages + +}