Update build-deb to make correct use of DOCKER_BUILD_PKGS

An environment variable cannot directly be used as a bash array, this patch loops through all the IFS separated value (which default to space) instead. Signed-off-by: Kenfe-Mickael Laventure <[email protected]>
mtanlee · May 2, 2016 · 20e1b95 · 20e1b95
1 parent 2f6e3b0
commit 20e1b95
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/hack/make/build-deb b/hack/make/build-deb
@@ -41,7 +41,10 @@ set -e
 	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
 	pkgs=( $(find "${builderDir}/"*/ -type d) )
 	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=( $(echo ${DOCKER_BUILD_PKGS[@]/#/$builderDir\/}) )
+		pkgs=()
+		for p in $DOCKER_BUILD_PKGS; do
+			pkgs+=( "$builderDir/$p" )
+		done
 	fi
 	for dir in "${pkgs[@]}"; do
 		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }

diff --git a/hack/make/build-rpm b/hack/make/build-rpm
@@ -71,7 +71,10 @@ set -e
 	builderDir="contrib/builder/rpm/${PACKAGE_ARCH}"
 	pkgs=( $(find "${builderDir}/"*/ -type d) )
 	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=( $(echo ${DOCKER_BUILD_PKGS[@]/#/$builderDir\/}) )
+		pkgs=()
+		for p in $DOCKER_BUILD_PKGS; do
+			pkgs+=( "$builderDir/$p" )
+		done
 	fi
 	for dir in "${pkgs[@]}"; do
 		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }

diff --git a/hack/make/test-deb-install b/hack/make/test-deb-install
@@ -16,7 +16,10 @@ test_deb_install(){
 	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
 	pkgs=( $(find "${builderDir}/"*/ -type d) )
 	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=( $(echo ${DOCKER_BUILD_PKGS[@]/#/$builderDir\/}) )
+		pkgs=()
+		for p in $DOCKER_BUILD_PKGS; do
+			pkgs+=( "$builderDir/$p" )
+		done
 	fi
 	for dir in "${pkgs[@]}"; do
 		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }