From 20e1b9593ee1d23c5df7c78903d27a72cee711e8 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Thu, 28 Apr 2016 16:35:21 -0700
Subject: [PATCH] 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 <mickael.laventure@gmail.com>
---
 hack/make/build-deb        | 5 ++++-
 hack/make/build-rpm        | 5 ++++-
 hack/make/test-deb-install | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hack/make/build-deb b/hack/make/build-deb
index 102d5351d2..de49954864 100644
--- 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
index 79fe5eee7d..b794ebc24b 100644
--- 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
index c4482cd428..aec5847600 100755
--- 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; }