[jbosstools-commits] JBoss Tools SVN: r23293 - branches/jbosstools-3.2.0.M1/build.

Author: nickboldt Date: 2010-07-07 17:13:45 -0400 (Wed, 07 Jul 2010) New Revision: 23293 Modified: branches/jbosstools-3.2.0.M1/build/publish.sh Log: prevent duplicate nested update sites Modified: branches/jbosstools-3.2.0.M1/build/publish.sh =================================================================== --- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-07 21:11:52 UTC (rev 23292) +++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-07 21:13:45 UTC (rev 23293) @@ -33,15 +33,15 @@ # 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 - #if [[ -f $z ]]; then - y=${z%%/site/target/*}; y=${y##*/} + y=${z%%/site/target/*}; y=${y##*/} + if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites #echo "[$y] $z ..." # unzip into workspace for publishing as unpacked site mkdir -p ${WORKSPACE}/site/${JOB_NAME}/$y unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/$y $z # copy into workspace for access by bucky aggregator (same name every time) rsync -aq $z ${WORKSPACE}/site/${JOB_NAME}/${y}-Update-SNAPSHOT.zip - #fi + fi done # if zips exist produced & renamed by ant script, copy them too