Author: nickboldt Date: 2010-06-18 12:05:51 -0400 (Fri, 18 Jun 2010) New Revision: 22886 Modified: trunk/build/publish.sh Log: check for site_assembly.zip too Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-06-18 15:53:14 UTC (rev 22885) +++ trunk/build/publish.sh 2010-06-18 16:05:51 UTC (rev 22886) @@ -5,23 +5,25 @@ SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} -if [[ -f ${WORKSPACE}/sources/site/target/site.zip ]]; then - # note the job name, build number, and build ID of the latest snapshot zip - echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt - echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt - echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt +for z in ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/sources/site/target/site_assembly.zip; do + if [[ -f $z ]]; then + # note the job name, build number, and build ID of the latest snapshot zip + echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt + echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt + echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt - # unzip into workspace for publishing as unpacked site - unzip -q ${WORKSPACE}/sources/site/target/site.zip -d ${WORKSPACE}/site/${JOB_NAME}/ + # unzip into workspace for publishing as unpacked site + unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/ - # copy into workspace for access by bucky aggregator (same name every time) - rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} -fi + # copy into workspace for access by bucky aggregator (same name every time) + rsync -aq $z ${WORKSPACE}/site/${SNAPNAME} + fi +done # if zips exist produced & renamed by ant script, copy them too for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do echo "$z ..." - unzip -q $z -d ${WORKSPACE}/site/${JOB_NAME}/ + unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/ rsync -aq $z ${WORKSPACE}/site/${SNAPNAME} done