[jbosstools-commits] JBoss Tools SVN: r43711 - trunk/build/util/cleanup.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2012-09-14 15:27:34 -0400 (Fri, 14 Sep 2012)
New Revision: 43711

Modified:
   trunk/build/util/cleanup/devstudio-product-cleanup.sh
   trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org

Modified: trunk/build/util/cleanup/devstudio-product-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/devstudio-product-cleanup.sh	2012-09-14 19:23:57 UTC (rev 43710)
+++ trunk/build/util/cleanup/devstudio-product-cleanup.sh	2012-09-14 19:27:34 UTC (rev 43711)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This script is run here: http://hudson.qa.jboss.com/hudson/job/devstudio-cleanup/configure
-# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse.releng/hudson/devstudio-cleanup.sh
+# And archived here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/devstudio-product-cleanup.sh
 # --------------------------------------------------------------------------------
 # clean JBDS builds from fish://dev01.qa.atl2.redhat.com:/qa/services/http/binaries/RHDS/{nightly,release}
 

Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh	2012-09-14 19:23:57 UTC (rev 43710)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh	2012-09-14 19:27:34 UTC (rev 43711)
@@ -89,11 +89,15 @@
 		# generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one
 		getSubDirs $sd 1; #return #getSubDirsReturn
 		getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
-		mkdir -p /tmp/cleanup-fresh-metadata/
-		regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
-		regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
-		rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools at filemgmt.jboss.org:$sd/
-		rm -fr /tmp/cleanup-fresh-metadata/
+		if [[ $getSubDirsCountReturn -gt 0 ]]; 
+			mkdir -p /tmp/cleanup-fresh-metadata/
+			regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
+			regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
+			rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools at filemgmt.jboss.org:$sd/
+			rm -fr /tmp/cleanup-fresh-metadata/
+		else
+			# TODO delete composite*.xml from $sd/ folder if there are no subdirs present
+		fi
 	done
 	echo "" | tee -a $log	
 }