diff options
Diffstat (limited to 'usr-scratch.sh')
| -rwxr-xr-x | usr-scratch.sh | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/usr-scratch.sh b/usr-scratch.sh index e7d709f..0a7ec5f 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 1 19:46:59 2010 David Farning +## Last update Tue Feb 2 20:22:01 2010 David Farning ## set -eu @@ -141,7 +141,7 @@ function do_debootstrap() { prepare_chroot in_chroot - cp casper $CHROOT/etc/init.d/casper + #cp casper $CHROOT/etc/init.d/casper clean_chroot # restore_ssd @@ -154,13 +154,11 @@ function prepare_image_directory() rm -rf ${IMAGE} || failure "Failed to remove directory ${IMAGE}" fi mkdir -p ${IMAGE} + cp -a USR-master/* ${IMAGE}/ } function pack_squashfs() { - prepare_image_directory - cp -a USR-master/* ${IMAGE}/ - echo "Updating files lists..." ${CCMD} dpkg-query -W --showformat='${Package} ${Version}\n' > ${IMAGE}/casper/filesystem.manifest || failure "Cannot update filesystem.manifest, error=$?" @@ -237,7 +235,15 @@ function build_vm(){ } function upload_files(){ - rsync --compress ${ISO} sunjammer.sugarlabs.org:public_html/${DIST}-${ARCH}-${DATE}.iso + RELEASE=${DIST}-${ARCH}-${DATE} + for TYPE in iso vmdk ovf mf; do + chown dfarning:dfarning ~/usr/output/${RELEASE}.${TYPE} + chmod 0777 ~/usr/output/${RELEASE}.${TYPE} + rsync --compress --verbose --progress ~/usr/output/${RELEASE}.${TYPE} dfarning@sunjammer.sugarlabs.org:public_html/${RELEASE}.${TYPE} + done +# for TYPE in iso vmdk ovf mf; do +# ssh dfarning@sunjammer.sugarlabs.org 'cp staging/${RELEASE}.${TYPE} public_html/${RELELASE}.${TYPE}' +# done } case $1 in @@ -285,10 +291,10 @@ all) COLUMNS=500 do_debootstrap 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG COLUMNS=500 build_vm 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG COLUMNS=500 upload_files 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG ;; -debug) do_debootstrapG +debug) do_debootstrap pack_squashfs pack_iso - build_vm - upload_files + #build_vm + #upload_files ;; esac |