From f32ee99f7cadbb4e9d237f3778f56b8cac69f07a Mon Sep 17 00:00:00 2001
From: David Farning <dfarning@launchpad.sugarlabs.org>
Date: Sat, 13 Feb 2010 18:10:28 +0000
Subject: blank

---
diff --git a/usr-scratch.sh b/usr-scratch.sh
index 5e81569..0a92aec 100755
--- a/usr-scratch.sh
+++ b/usr-scratch.sh
@@ -6,7 +6,7 @@
 ## Login   <dfarning@acer>
 ## 
 ## Started on  Sat Jan  9 03:45:30 2010 David Farning
-## Last update Mon Feb  8 18:13:17 2010 David Farning
+## Last update Wed Feb 10 12:36:31 2010 David Farning
 ##
 
 set -eu
@@ -124,7 +124,8 @@ function prepare_filesystem_directory()
 
 
 function do_debootstrap() {
-    echo "    DIST=${DIST}
+    echo "DATE=${DATE}
+    DIST=${DIST}
     ARCH=${ARCH}
     CHROOT=${CHROOT}"
 
@@ -149,11 +150,13 @@ function prepare_image_directory()
     	rm -rf ${IMAGE} || failure "Failed to remove directory ${IMAGE}"
     fi
     mkdir -p ${IMAGE}
-    cp -a ${ISOTEMPLATE}/* ${IMAGE}/ 
+    cp -av ${ISOTEMPLATE}/* ${IMAGE}/ 
 }
 
 function pack_squashfs()
 {
+    prepare_image_directory
+
     echo "Updating files lists..."
     ${CCMD} dpkg-query -W --showformat='${Package} ${Version}\n' > ${IMAGE}/casper/filesystem.manifest || failure "Cannot update filesystem.manifest, error=$?"
    
@@ -235,8 +238,8 @@ function upload_files(){
     done
     for TYPE in iso vmdk ovf mf; do
 	FILE=${RELEASE}.${TYPE}
-	ssh ${LOGIN}  "mv stagingmkdir/'${FILE}'public_html/'${FILE}'"
-	#ssh ${LOGIN} "ln -s public_html/'${FILE}' public_html/'${DIST}'-'${ARCH}'-current.'${TYPE}'"
+	ssh ${LOGIN}  "cp staging/'${FILE}' public_html/'${FILE}'"
+	ssh ${LOGIN} "ln public_html/'${FILE}' public_html/'${DIST}'-'${ARCH}'-current.'${TYPE}'"
     done
 }
 
--
cgit v0.9.1