From fbf68a561760337e353d14f3ee47a181a1f5b668 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 5 Jan 2010 10:17:13 +0000 Subject: [PATCH] oops --- vbuild-nightly.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index dfc33662..ff3bc65f 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -539,21 +539,21 @@ function main () { FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh) PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTRO) - options=($options -d $PLDISTRO) + options=(${options[@]} -d $PLDISTRO) PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTROTAGS) - options=($options -t $PLDISTROTAGS) + options=(${options[@]} -t $PLDISTROTAGS) build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH) - options=($options -s $build_SVNPATH) + options=(${options[@]} -s $build_SVNPATH) PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PERSONALITY) - [ -n "$PERSONALITY" ] && options=($options -p $PERSONALITY) + [ -n "$PERSONALITY" ] && options=(${options[@]} -p $PERSONALITY) MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +MAILTO) - [ -n "$MAILTO" ] && options=($options -m $MAILTO) + [ -n "$MAILTO" ] && options=(${options[@]} -m $MAILTO) WEBPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBPATH) - [ -n "$WEBPATH" ] && options=($options -w $WEBPATH) + [ -n "$WEBPATH" ] && options=(${options[@]} -w $WEBPATH) TESTBUILDURL=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +TESTBUILDURL) - [ -n "$TESTBUILDURL" ] && options=($options -W $TESTBUILDURL) + [ -n "$TESTBUILDURL" ] && options=(${options[@]} -W $TESTBUILDURL) WEBROOT=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBROOT) - [ -n "$WEBROOT" ] && options=($options -r $WEBROOT) + [ -n "$WEBROOT" ] && options=(${options[@]} -r $WEBROOT) show_env else # create vserver: check it does not exist yet -- 2.47.0