From a03798cb97f1227372fe83c2b3f034a59d44db72 Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sat, 22 Apr 2023 01:32:54 +0200
Subject: [PATCH] buildscript.sh: use bash arrays for make parameters also for
clean and build
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
buildscript.sh | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/buildscript.sh b/buildscript.sh
index ef80ac7..7a9ba7a 100755
--- a/buildscript.sh
+++ b/buildscript.sh
@@ -151,20 +151,20 @@ prepare_sitemk(){
}
gluon_build(){
- preflags=" -C $EXECDIR/.."
- midflags=""
- postflags=" GLUON_TARGET=$1 GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR=output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE) GLUON_PACKAGEDIR=output/packages/$(cat "$EXECDIR"/.prepare)"
+ preflags=( -C "$EXECDIR"/..)
+ midflags=()
+ postflags=(GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR=output/images/"$(cat "$EXECDIR"/.prepare)"/"$(cat "$EXECDIR"/.GLUON_RELEASE)" GLUON_PACKAGEDIR=output/packages/"$(cat "$EXECDIR"/.prepare)")
error_build=0
if [ "$2" == "fast" ] && [ -a "/proc/cpuinfo" ]; then
- midflags=$midflags" -j $(($(grep -c processor /proc/cpuinfo)+1))"
+ midflags=("${midflags[@]}" -j $(($(grep -c processor /proc/cpuinfo)+1)))
fi
if [ "$3" == "silent" ]; then
- preflags=" --silent"$preflags
+ preflags=( --silent "${preflags[@]}")
fi;
if [ -a "$EXECDIR/.BROKEN" ]; then
- midflags=$midflags" BROKEN=1"
+ midflags=("${midflags[@]}" BROKEN=1)
fi;
- if ! make "$preflags" "$midflags" "$postflags"; then
+ if ! make "${preflags[@]}" "${midflags[@]}" "${postflags[@]}"; then
error_build=1
fi;
if [ $error_build -eq 1 ]; then
@@ -173,16 +173,16 @@ gluon_build(){
}
gluon_clean(){
- preflags=" -C $EXECDIR/.."
- midflags=""
- postflags=" GLUON_TARGET=$1 GLUON_IMAGEDIR=output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE) GLUON_PACKAGEDIR=output/packages/$(cat "$EXECDIR"/.prepare)"
+ preflags=( -C "$EXECDIR"/..)
+ midflags=()
+ postflags=(GLUON_TARGET="$1" GLUON_IMAGEDIR=output/images/"$(cat "$EXECDIR"/.prepare)"/"$(cat "$EXECDIR"/.GLUON_RELEASE)" GLUON_PACKAGEDIR=output/packages/"$(cat "$EXECDIR"/.prepare)")
if [ "$2" == "fast" ] && [ -a "/proc/cpuinfo" ]; then
- midflags=$midflags" -j $(($(grep -c processor /proc/cpuinfo)+1))"
+ midflags=("${midflags[@]}" -j $(($(grep -c processor /proc/cpuinfo)+1)))
fi
if [ -a "$EXECDIR/.BROKEN" ]; then
- midflags=$midflags" BROKEN=1"
+ midflags=("${midflags[@]}" BROKEN=1)
fi
- make "$preflags" "$midflags" "$postflags" clean
+ make "${preflags[@]}" "${midflags[@]}" "${postflags[@]}" clean
}
--
GitLab