Author: nickboldt Date: 2010-07-08 18:14:21 -0400 (Thu, 08 Jul 2010) New Revision: 23329 Modified: trunk/build/publish.sh Log: fix check for aggregate update site zip Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-07-08 22:14:16 UTC (rev 23328) +++ trunk/build/publish.sh 2010-07-08 22:14:21 UTC (rev 23329) @@ -11,13 +11,23 @@ # cleanup from last time rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} -siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip -if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then - siteZip=${WORKSPACE}/sources/site/target/site.zip +# check for aggregate zip or overall zip +z="" +if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then + siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip + if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then + siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip + fi + z=$siteZip +elif [[ -d ${WORKSPACE}/sources/site/target ]]; then + siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip + if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then + siteZip=${WORKSPACE}/sources/site/target/site.zip + fi + z=$siteZip fi -z=$siteZip -if [[ -f $z ]]; then +if [[ $z != "" ]] && [[ -f $z ]] ; then #echo "$z ..." # 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 @@ -30,6 +40,7 @@ # copy into workspace for access by bucky aggregator (same name every time) rsync -aq $z ${WORKSPACE}/site/${SNAPNAME} fi +z="" # if component zips exist, copy them too; first site.zip, then site_assembly.zip for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do