Setting tag NodeManager-1.8-21

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 1c9c6cf..c539255 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -537,23 +537,20 @@ function main () {
            vserver ${BASE} exec svn update /build
            # get environment from the first run 
            FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
-
-           PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTRO)
-           options=($options -d $PLDISTRO)
-           PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +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)
-           PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PERSONALITY)
-           options=($options -p $PERSONALITY)
-           MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +MAILTO)
-           options=($options -m $MAILTO)
-           WEBPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBPATH)
-           options=($options -w $WEBPATH)
-           TESTBUILDURL=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +TESTBUILDURL)
-           options=($options -W $TESTBUILDURL)
-           WEBROOT=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBROOT)
-           options=($options -r $WEBROOT)
+           # retrieve all in one run
+           tmp=/tmp/${BASE}-env.sh
+           vserver ${BASE} exec make --no-print-directory -C /build stage1=skip \
+               ++PLDISTRO ++PLDISTROTAGS ++PERSONALITY ++MAILTO ++WEBPATH ++TESTBUILDURL ++WEBROOT > $tmp
+           # sh vars cannot have a minus
+           echo build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH) >> $tmp
+           . $tmp
+           rm -f $tmp
+           options=(${options[@]} -d $PLDISTRO -t $PLDISTROTAGS -s $build_SVNPATH)
+           [ -n "$PERSONALITY" ] && options=(${options[@]} -p $PERSONALITY)
+           [ -n "$MAILTO" ] && options=(${options[@]} -m $MAILTO)
+           [ -n "$WEBPATH" ] && options=(${options[@]} -w $WEBPATH)
+           [ -n "$TESTBUILDURL" ] && options=(${options[@]} -W $TESTBUILDURL)
+           [ -n "$WEBROOT" ] && options=(${options[@]} -r $WEBROOT)
            show_env
        else
            # create vserver: check it does not exist yet