Author: nickboldt Date: 2011-09-05 02:46:47 -0400 (Mon, 05 Sep 2011) New Revision: 34515 Modified: branches/jbosstools-3.2.x/build/publish.sh Log: use only site_assembly.zip as site.zip is useless (only contains metadata, but no features/plugins) Modified: branches/jbosstools-3.2.x/build/publish.sh =================================================================== --- branches/jbosstools-3.2.x/build/publish.sh 2011-09-04 23:53:25 UTC (rev 34514) +++ branches/jbosstools-3.2.x/build/publish.sh 2011-09-05 06:46:47 UTC (rev 34515) @@ -41,21 +41,12 @@ 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/aggregate/site/site/target ]]; then siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip - if [[ ! -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then - siteZip=${WORKSPACE}/sources/aggregate/site/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 @@ -113,8 +104,8 @@ 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 +# if component zips exist, copy site_assembly.zip too +for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site_assembly.zip"); do y=${z%%/site/target/*}; y=${y##*/} if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites #echo "[$y] $z ..."