From 1c39661e8a94bdb043fceab74d1695a3224907e1 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Mar 30 2011 03:49:32 +0000 Subject: Update filter construction to make it greedy. For example, if we are in the path: trunk/Identity/Themes/Motifs/TreeFlower/4/Distro/5/Anaconda/ |-- 01-welcome.png |-- 02-donate.png |-- 03-yum.png |-- 04-repos.png |-- 05-centosplus.png |-- 06-support.png |-- 07-docs.png |-- 08-wiki.png |-- 09-virtualization.png |-- anaconda_header.png |-- first.png `-- splash.png the following two commands will render the `01-welcome.png' file: centos-art render . --filter='01' centos-art render . --filter='01-welcome' otherwise, it would be required to provide the full filename, as we did in the last command (i.e., the first command wouldn't match). --- diff --git a/Scripts/Functions/Locale/locale_updateMessageShell.sh b/Scripts/Functions/Locale/locale_updateMessageShell.sh index eae88cb..8968fc6 100755 --- a/Scripts/Functions/Locale/locale_updateMessageShell.sh +++ b/Scripts/Functions/Locale/locale_updateMessageShell.sh @@ -37,7 +37,7 @@ function locale_updateMessageShell { # Build list of files to process. if [[ $ACTIONVAL =~ "^${CLI_BASEDIR}" ]];then - FILES=$(cli_getFilesList "$ACTIONVAL" "${FLAG_FILTER}\.sh") + FILES=$(cli_getFilesList "$ACTIONVAL" "${FLAG_FILTER}.*\.sh") else cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' cli_printMessage "${FUNCDIRNAM}" 'AsToKnowMoreLine' diff --git a/Scripts/Functions/Locale/locale_updateMessageXml.sh b/Scripts/Functions/Locale/locale_updateMessageXml.sh index 486bbee..0517305 100755 --- a/Scripts/Functions/Locale/locale_updateMessageXml.sh +++ b/Scripts/Functions/Locale/locale_updateMessageXml.sh @@ -39,7 +39,7 @@ function locale_updateMessageXml { # Build list of files to process. if [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Identity/(Models|Manual|Themes/Models)/.+$" ]];then - FILES=$(cli_getFilesList "$ACTIONVAL" "${FLAG_FILTER}\.${EXTENSION}") + FILES=$(cli_getFilesList "$ACTIONVAL" "${FLAG_FILTER}.*\.${EXTENSION}") else cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' cli_printMessage "${FUNCDIRNAM}" 'AsToKnowMoreLine'