Author: nickboldt Date: 2010-07-16 11:42:47 -0400 (Fri, 16 Jul 2010) New Revision: 23502 Modified: trunk/build/publish.sh Log: support option to pass in cmdline param 'trunk' to push update site into standard location Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-07-16 15:21:27 UTC (rev 23501) +++ trunk/build/publish.sh 2010-07-16 15:42:47 UTC (rev 23502) @@ -20,7 +20,7 @@ # define suffix to use for additional update sites SUFFNAME="-Update-${ZIPSUFFIX}.zip" -if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/nightly/3.2.helios"; fi +if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi # cleanup from last time rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR} @@ -135,15 +135,23 @@ # publish to download.jboss.org, unless errors found - avoid destroying last-good update site if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then -date # publish update site dir if [[ -d ${STAGINGDIR} ]]; then - rsync -arzq --delete ${STAGINGDIR} $DESTINATION/ + date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/ fi # publish update site zip if [[ -f ${WORKSPACE}/results/${SNAPNAME} ]]; then - rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/ + date; rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/ fi + + # extra publish step for aggregate update sites ONLY + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then + if [[ $1 == "trunk" ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/ + else + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOB_NAME/.aggregate}/ + fi + fi fi date