cleanup /tmp

diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh
index 2a4bef5..04970ed 100755 (executable)
--- 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