From 71fe06f98ce2d29f29c7abfc6a0baccaee164a16 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 17 Oct 2017 17:18:40 +0200
Subject: [PATCH] build: fix PORTS_LIST / PLUGINS_LIST usage

---
 build/distfiles.sh | 10 +++++++++-
 build/plugins.sh   | 10 +++++++++-
 build/ports.sh     | 10 +++++++++-
 build/skim.sh      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/build/distfiles.sh b/build/distfiles.sh
index c914f05..253511e 100644
--- a/build/distfiles.sh
+++ b/build/distfiles.sh
@@ -31,7 +31,8 @@ SELF=distfiles
 
 . ./common.sh
 
-[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
+if [ -z "${PORTS_LIST}" ]; then
+	PORTS_LIST=$(
 cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
     while read PORT_ORIGIN PORT_IGNORE; do
 	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
@@ -48,6 +49,13 @@ cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
 	echo ${PORT_ORIGIN}
 done
 )
+else
+	PORTS_LIST=$(
+for PORT_ORIGIN in ${PORTS_LIST}; do
+	echo ${PORT_ORIGIN}
+done
+)
+fi
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
diff --git a/build/plugins.sh b/build/plugins.sh
index ecd1617..384583e 100644
--- a/build/plugins.sh
+++ b/build/plugins.sh
@@ -31,7 +31,8 @@ SELF=plugins
 
 . ./common.sh
 
-[ -z ${PLUGINS_LIST} ] && PLUGINS_LIST=$(
+if [ -z "${PLUGINS_LIST}" ]; then
+	PLUGINS_LIST=$(
 cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
 	if [ "$(echo ${PLUGIN_ORIGIN} | colrm 2)" = "#" ]; then
 		continue
@@ -57,6 +58,13 @@ cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
 	echo ${PLUGIN_ORIGIN}
 done
 )
+else
+	PLUGINS_LIST=$(
+for PLUGIN_ORIGIN in ${PLUGIN_LIST}; do
+	echo ${PLUGIN_ORIGIN}
+done
+)
+fi
 
 check_packages ${SELF} ${@}
 
diff --git a/build/ports.sh b/build/ports.sh
index 78052a8..8745696 100644
--- a/build/ports.sh
+++ b/build/ports.sh
@@ -31,7 +31,8 @@ SELF=ports
 
 . ./common.sh
 
-[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
+if [ -z "${PORTS_LIST}" ]; then
+	PORTS_LIST=$(
 cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
 	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
 		continue
@@ -57,6 +58,13 @@ cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
 	echo ${PORT_ORIGIN}
 done
 )
+else
+	PORTS_LIST=$(
+for PORT_ORIGIN in ${PORTS_LIST}; do
+	echo ${PORT_ORIGIN}
+done
+)
+fi
 
 check_packages ${SELF} ${@}
 
diff --git a/build/skim.sh b/build/skim.sh
index 3d6042a..05ca75b 100644
--- a/build/skim.sh
+++ b/build/skim.sh
@@ -35,7 +35,8 @@ setup_stage ${STAGEDIR}
 
 MAKE_ARGS="__MAKE_CONF=${CONFIGDIR}/make.conf PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}"
 
-[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
+if [ -z "${PORTS_LIST}" ]; then
+	PORTS_LIST=$(
 cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
     while read PORT_ORIGIN PORT_IGNORE; do
 	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
@@ -44,6 +45,13 @@ cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
 	echo ${PORT_ORIGIN}
 done
 )
+else
+	PORTS_LIST=$(
+for PORT_ORIGIN in ${PORTS_LIST}; do
+	echo ${PORT_ORIGIN}
+done
+)
+fi
 
 DIFF="$(which colordiff 2> /dev/null || echo cat)"
 LESS="less -R"