From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Mon, 12 Nov 2007 06:02:29 +0000 (+0000)
Subject: cleanup /tmp
X-Git-Tag: foo~390
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=136f77c188ca341569c48c0a619ec16de85e8ede;p=infrastructure.git

cleanup /tmp
---

diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh
index 2a4bef5..04970ed 100755
--- a/scripts/nightly-build-vserver.sh
+++ b/scripts/nightly-build-vserver.sh
@@ -238,16 +238,16 @@ function main () {
 	    show_env
 
 	    ### extract vbuild-init-vserver.sh and run it
-	    svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-init-vserver-$$
+	    svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-$$.sh
 	    # get -devel.lst
 	    set +e
-	    svn cat $SVNPATH/${PLDISTRO}-devel-${FCDISTRO}.lst > /tmp/devel-$$.lst 
+	    svn cat $SVNPATH/${PLDISTRO}-devel-${FCDISTRO}.lst > /tmp/vbuild-devel-$$.lst 
 	    if [ "$?" = 0 ] ; then 
-		mv /tmp/devel-$$.lst /tmp/${PLDISTRO}-devel-${FCDISTRO}.lst
+		mv /tmp/vbuild-devel-$$.lst /tmp/${PLDISTRO}-devel-${FCDISTRO}.lst
 	    else 
-		svn cat $SVNPATH/${PLDISTRO}-devel.lst > /tmp/devel-$$.lst
+		svn cat $SVNPATH/${PLDISTRO}-devel.lst > /tmp/vbuild-devel-$$.lst
 		if [ "$?" = 0 ] ; then
-		    mv /tmp/devel-$$.lst /tmp/${PLDISTRO}-devel.lst
+		    mv /tmp/vbuild-devel-$$.lst /tmp/${PLDISTRO}-devel.lst
 		else
 		    echo "$COMMAND: Cannot locate ${PLDISTRO}-devel.lst"
 		    failure
@@ -257,8 +257,10 @@ function main () {
 
             # Create vserver
 	    cd /tmp
-	    chmod +x vbuild-init-vserver-$$
-	    /tmp/vbuild-init-vserver-$$ ${BASE} ${FCDISTRO} ${PLDISTRO}
+	    chmod +x vbuild-$$.sh
+	    /tmp/vbuild-$$.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
+	    # cleanup
+	    rm -f /tmp/vbuild-$$*
 	    cd -
 	    # Extract build
 	    vserver ${BASE} exec svn checkout ${SVNPATH} /build