Author: nickboldt Date: 2010-06-01 15:34:53 -0400 (Tue, 01 Jun 2010) New Revision: 22464 Modified: branches/3.2.helios/build/publish.sh Log: merge from trunk Modified: branches/3.2.helios/build/publish.sh =================================================================== --- branches/3.2.helios/build/publish.sh 2010-06-01 19:33:44 UTC (rev 22463) +++ branches/3.2.helios/build/publish.sh 2010-06-01 19:34:53 UTC (rev 22464) @@ -8,17 +8,17 @@ SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} -if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then +if [[ -f ${WORKSPACE}/sources/site/target/site.zip ]]; then # copy into workspace for archiving - rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME} + rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME} # copy into workspace for access by bucky aggregator - rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} + rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} fi # if zips exist produced & renamed by ant script, copy them too -if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then - rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JOB_NAME}/ -fi +for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 4 -name "*Update*.zip"); do + rsync -aq $z ${WORKSPACE}/site/${JOB_NAME}/ +done # publish to download.jboss.org if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi