From d8b66633dd592ad2218d28fd91c528c0bc50487e Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Thu, 8 Sep 2005 17:37:32 +0000 Subject: [PATCH] * sgml-catalog.eclass: Use a global scalar instead of a bash array. Avoid calling 'seq' (bug #103383). --- eclass/sgml-catalog.eclass | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass index e3111b46d404..02c4caa93df4 100644 --- a/eclass/sgml-catalog.eclass +++ b/eclass/sgml-catalog.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.13 2005/07/15 17:01:14 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.14 2005/09/08 17:37:32 leonardop Exp $ # # Author Matthew Turk @@ -8,13 +8,14 @@ inherit base DEPEND=">=app-text/sgml-common-0.6.3-r2" -declare -a toinstall -declare -i catcounter -let "catcounter=0" + +# List of catalogs to install +SGML_TOINSTALL="" + sgml-catalog_cat_include() { debug-print function $FUNCNAME $* - toinstall["catcounter++"]="${1}:${2}" + SGML_TOINSTALL="${SGML_TOINSTALL} ${1}:${2}" } sgml-catalog_cat_doinstall() { @@ -29,12 +30,10 @@ sgml-catalog_cat_doremove() { sgml-catalog_pkg_postinst() { debug-print function $FUNCNAME $* - declare -i topindex - topindex="catcounter-1" - for i in `seq 0 ${topindex}` - do - arg1=`echo ${toinstall[$i]} | cut -f1 -d\:` - arg2=`echo ${toinstall[$i]} | cut -f2 -d\:` + + for entry in ${SGML_TOINSTALL}; do + arg1=`echo ${entry} | cut -f1 -d\:` + arg2=`echo ${entry} | cut -f2 -d\:` if [ ! -e ${arg2} ] then ewarn "${arg2} doesn't appear to exist, although it ought to!" @@ -52,12 +51,10 @@ sgml-catalog_pkg_prerm() { sgml-catalog_pkg_postrm() { debug-print function $FUNCNAME $* - declare -i topindex - topindex="catcounter-1" - for i in `seq 0 ${topindex}` - do - arg1=`echo ${toinstall[$i]} | cut -f1 -d\:` - arg2=`echo ${toinstall[$i]} | cut -f2 -d\:` + + for entry in ${SGML_TOINSTALL}; do + arg1=`echo ${entry} | cut -f1 -d\:` + arg2=`echo ${entry} | cut -f2 -d\:` if [ -e ${arg2} ] then ewarn "${arg2} still exists! Not removing from ${arg1}" -- 2.26.2