[PATCH 13/20] - simplified and corrected FEEDVAR array handling

Steffen Pankratz kratz00 at gmx.de
Mi Jul 15 21:47:59 CEST 2015


Signed-off-by: Steffen Pankratz <kratz00 at gmx.de>
---
 buildscript | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildscript b/buildscript
index e642194..635e643 100755
--- a/buildscript
+++ b/buildscript
@@ -73,8 +73,8 @@ get_source() {
 	cd packages
 
 	#checkout needed package feeds
-	for FEEDVAR in ${FEEDS[@]} ; do
-		FEED=$FEEDVAR[@] FEED=( ${!FEED} )
+	for FEEDVAR in "${FEEDS[@]}" ; do
+		FEED=( $(eval echo \${"$FEEDVAR"[@]}) )
 
 		local NAME=${FEED[0]}
 		local URL=${FEED[1]}
@@ -106,8 +106,8 @@ prepare() {
 	#this local variable should be globally configure variable used in get_source and here
 	local PACKAGEBASE=${PWD}/src/packages
 	rm -f $target/feeds.conf
-	for FEEDVAR in ${FEEDS[@]} ; do
-		FEED=$FEEDVAR[@] FEED=( ${!FEED} )
+	for FEEDVAR in "${FEEDS[@]}" ; do
+		FEED=( $(eval echo \${"$FEEDVAR"[@]}) )
 		local NAME=${FEED[0]}
 		echo "adding $NAME to package feeds"
 		echo src-link $NAME $PACKAGEBASE/$NAME >> $target/feeds.conf
@@ -118,8 +118,8 @@ prepare() {
 
 	$target/scripts/feeds update
 
-	for FEEDVAR in ${FEEDS[@]} ; do
-		FEED=$FEEDVAR[@] FEED=( ${!FEED} )
+	for FEEDVAR in "${FEEDS[@]}" ; do
+		FEED=( $(eval echo \${"$FEEDVAR"[@]}) )
 		local NAME=${FEED[0]}
 		local PACKAGESVAR=${FEEDVAR}_PKGS
 
-- 
2.4.5




Mehr Informationen über die Mailingliste franken-dev