jlec 14/09/15 17:54:11 Modified: ChangeLog intel-sdp.eclass Log: Allow RPMS specified as array
Revision Changes Path 1.1369 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1369&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1369&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1368&r2=1.1369 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1368 retrieving revision 1.1369 diff -u -r1.1368 -r1.1369 --- ChangeLog 11 Sep 2014 22:10:35 -0000 1.1368 +++ ChangeLog 15 Sep 2014 17:54:11 -0000 1.1369 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1368 2014/09/11 22:10:35 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1369 2014/09/15 17:54:11 jlec Exp $ + + 15 Sep 2014; Justin Lecher <[email protected]> intel-sdp.eclass: + Allow RPMS specified as array 11 Sep 2014; Ian Stakenvicius (_AxS_) <[email protected]> +mozconfig-v4.31.eclass, -mozconfig-v4.eclass: 1.18 eclass/intel-sdp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.17&r2=1.18 Index: intel-sdp.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- intel-sdp.eclass 21 Feb 2014 16:07:25 -0000 1.17 +++ intel-sdp.eclass 15 Sep 2014 17:54:11 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.17 2014/02/21 16:07:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.18 2014/09/15 17:54:11 jlec Exp $ # @ECLASS: intel-sdp.eclass # @MAINTAINER: @@ -348,7 +348,12 @@ fi INTEL_RPMS=() INTEL_RPMS_FULL=() - for p in ${INTEL_BIN_RPMS}; do + if [[ $(declare -p INTEL_BIN_RPMS) = "declare -a "* ]] ; then + _INTEL_BIN_RPMS=( ${INTEL_BIN_RPMS[@]} ) + else + read -r -d '' -a _INTEL_BIN_RPMS <<<"${INTEL_BIN_RPMS}" + fi + for p in "${_INTEL_BIN_RPMS[@]}"; do for a in ${arch}; do if [ ${p} == $(basename ${p}) ]; then INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm ) @@ -357,7 +362,12 @@ fi done done - for p in ${INTEL_DAT_RPMS}; do + if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then + _INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} ) + else + read -r -d '' -a _INTEL_DAT_RPMS <<<"${INTEL_DAT_RPMS}" + fi + for p in "${_INTEL_DAT_RPMS[@]}"; do if [ ${p} == $(basename ${p}) ]; then INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) else @@ -373,12 +383,12 @@ local l r subdir rb t list=() debug_list for t in ${A}; do - for r in ${INTEL_RPMS[@]}; do + for r in "${INTEL_RPMS[@]}"; do rpmdir=${t%%.*}/${INTEL_RPMS_DIR} list+=( ${rpmdir}/${r} ) done - for r in ${INTEL_RPMS_FULL[@]}; do + for r in "${INTEL_RPMS_FULL[@]}"; do list+=( ${t%%.*}/${r} ) done
