Author: nickboldt Date: 2011-09-15 13:25:35 -0400 (Thu, 15 Sep 2011) New Revision: 34776 Modified: branches/jbosstools-3.3.0.M3/build/publish.sh Log: only publish site_assembly.zip, not site.zip (empty zip) Modified: branches/jbosstools-3.3.0.M3/build/publish.sh =================================================================== --- branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:21:21 UTC (rev 34775) +++ branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:25:35 UTC (rev 34776) @@ -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 ..."