[releng] updates tree path cleanups

[Dennis Gilmore]

commit 19871700feea36f5f270589381066b2ab77e0549
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Mar 9 01:53:26 2015 -0500

    updates tree path cleanups

 scripts/make-updates |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/scripts/make-updates b/scripts/make-updates
index a73db2b..8f3c945 100755
--- a/scripts/make-updates
+++ b/scripts/make-updates
@@ -42,35 +42,35 @@ do
   fi
 done
 
-
-pushd $FINALDEST/$VERSION/
-sg releng "mkdir -p Cloud-Images/i386/Images Cloud-Images/x86_64/Images "
+sg releng "mkdir -p $FINALDEST"
+pushd $FINALDEST/
+sg releng "mkdir -p Cloud-Images/i386/Images Cloud-Images/x86_64/Images Docker/x86_64"
 popd
 
 
 USER=$(whoami)
 # stage images
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.i386.raw.xz $FINALDEST/$VERSION/Cloud-Images/i386/Images/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.i386.qcow2 $FINALDEST/$VERSION/Cloud-Images/i386/Images/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.raw.xz $FINALDEST/$VERSION/Cloud-Images/x86_64/Images/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.qcow2 $FINALDEST/$VERSION/Cloud-Images/x86_64/Images/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.*.ova $FINALDEST/$VERSION/Cloud-Images/x86_64/Images/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Docker*-$VERSION-$DATE*tar.gz $FINALDEST/$VERSION/Docker/x86_64/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.i386.raw.xz $FINALDEST/Cloud-Images/i386/Images/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.i386.qcow2 $FINALDEST/Cloud-Images/i386/Images/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.raw.xz $FINALDEST/Cloud-Images/x86_64/Images/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.qcow2 $FINALDEST/Cloud-Images/x86_64/Images/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$VERSION-$DATE\.x86_64.*.ova $FINALDEST/Cloud-Images/x86_64/Images/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Docker*-$VERSION-$DATE*tar.gz $FINALDEST//Docker/x86_64/"
 
 
 
-pushd $FINALDEST/$VERSION/Cloud-Images
+pushd $FINALDEST/Cloud-Images
 for arch in i386 x86_64; do pushd $arch/Images; sg releng "sha256sum --tag -b *qcow2 *raw.xz *ova>  Fedora-Cloud-Images-$arch-$VERSION-CHECKSUM"; popd; done
 popd
 
-pushd $FINALDEST/$VERSION/Docker/x86_64
+pushd $FINALDEST/Docker/x86_64
 sg releng "sha256sum --tag -b *tar.gz>  Fedora-Docker-x86_64-$VERSION-CHECKSUM"
 popd
 
 
 # stage the composed tree to final locateion
-sg releng "mkdir /pub/alt/stage/$VERSION$COMPOSE/"
-sg releng "chmod 700 /pub/alt/stage/$VERSION$COMPOSE/"
-for type in Docker Cloud-Images; do sg releng "rsync -avhH $FINALDEST/$VERSION/$type/ /pub/alt/stage/$VERSION$COMPOSE/$type/"; done
-sg releng "chmod 755 /pub/alt/stage/$VERSION$COMPOSE/"
+sg releng "mkdir /pub/alt/stage/$VERSION-$DATE/"
+sg releng "chmod 700 /pub/alt/stage/$VERSION-$DATE/"
+for type in Docker Cloud-Images; do sg releng "rsync -avhH $FINALDEST/$type/ /pub/alt/stage/$VERSION-$DATE/$type/"; done
+sg releng "chmod 755 /pub/alt/stage/$VERSION-$DATE/"