simpler bootstrap : take the whole build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 21 Nov 2007 08:46:20 +0000 (08:46 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 21 Nov 2007 08:46:20 +0000 (08:46 +0000)
vbuild-nightly.sh

index d1aecfd..6d11e73 100755 (executable)
@@ -275,20 +275,16 @@ function main () {
            echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date)
            show_env
 
-           ### extract vbuild-init-vserver.sh and run it
-           svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-init-vserver-$$.sh
-           # get .lst 
-           lst=${PLDISTRO}-devel.lst
-           svn cat $SVNPATH/$lst > /tmp/$lst 
-
+           ### extract the whole build - much simpler
+           tmpdir=$(mktemp /tmp/$COMMAND.XXXXXX)
+           svn export $SVNPATH $tmpdir
             # Create vserver
-           cd /tmp
-           chmod +x vbuild-init-vserver-$$.sh
-           /tmp/vbuild-init-vserver-$$.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
+           cd $tmpdir
+           ./vbuild-init-vserver.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
            # cleanup
-           rm -f /tmp/vbuild-init-vserver-$$.sh /tmp/$lst
            cd -
-           # Extract build
+           rm -f $tmpdir
+           # Extract build again - in the vserver
            vserver ${BASE} exec svn export ${SVNPATH} /build
        fi
        echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)