From b75aa9ace92fc8978513f1a9ca80effd490a7d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Thu, 17 Oct 2013 20:33:34 -0700 Subject: [PATCH] Change bundle order, and fix shell array expansion. I believe that it is helpful to build the binary first. That way, if you interrupt the tests, you still get a binary to play with. If you run the tests first and interrupt them, no binary for you! Also, the second part of this commit is an undeniable proof that Bash array syntax is nothing else than an elaborate troll by Bash authors. Upstream-commit: 85956c70b5613439d9f239550c5c4ec360339cb6 Component: engine --- components/engine/hack/make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh index f911c035f2..4eecfd0484 100755 --- a/components/engine/hack/make.sh +++ b/components/engine/hack/make.sh @@ -33,8 +33,8 @@ grep -q "$RESOLVCONF" /proc/mounts || { # List of bundles to create when no argument is passed DEFAULT_BUNDLES=( - test binary + test ubuntu ) @@ -67,7 +67,7 @@ main() { fi SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -lt 1 ]; then - bundles=($DEFAULT_BUNDLES) + bundles=(${DEFAULT_BUNDLES[@]}) else bundles=($@) fi