[jbosstools-commits] JBoss Tools SVN: r23328 - branches/jbosstools-3.2.0.M1/build.
Author: nickboldt
Date: 2010-07-08 18:14:16 -0400 (Thu, 08 Jul 2010)
New Revision: 23328
Modified:
branches/jbosstools-3.2.0.M1/build/publish.sh
Log:
fix check for aggregate update site zip
Modified: branches/jbosstools-3.2.0.M1/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-08 21:58:55 UTC (rev 23327)
+++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-08 22:14:16 UTC (rev 23328)
@@ -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
@@ -69,10 +80,14 @@
if [[ $ec != "0" ]]; then
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "ORS
FOUND: "$ec >> ${el};
fi
+
+date
rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/*LOG.txt $DESTINATION/${JOB_NAME}/
+date
# publish to download.jboss.org, unless errors found - avoid destroying last-good update
site
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
+date
if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/
fi
@@ -81,4 +96,4 @@
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/
fi
fi
-
+date