since we no longer have a 9.0 symlink to mars/ folder on dl.jb.org, s…

…cript needs to be better at knowing where to search; also, fix the param parser for version and versionWithRespin
jbosstools · Dec 12, 2015 · be30734 · be30734
1 parent 803cd06
commit be30734
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/publish/mergeISdiscovery.sh b/publish/mergeISdiscovery.sh
@@ -20,7 +20,7 @@ usage ()
   echo ""
   # TODO https://issues.jboss.org/browse/JBTIS-498 - should have more consistent URLs here
   echo "Example 1: $0 -v 4.3.0.CR1 -vr 4.3.0.CR1a -is http://download.jboss.org/jbosstools/mars/snapshots/builds/integration-stack/discovery/4.3.0.Alpha2/"
-  echo "Example 2: $0 -v 9.0.0.CR1 -vr 9.0.0.CR1a -is https://devstudio.redhat.com/9.0/staging/updates/integration-stack/discovery/9.0.0.Alpha2/ -JBDS"
+  echo "Example 2: $0 -v 9.0.0.CR1 -vr 9.0.0.CR1a -is https://devstudio.redhat.com/${rootFolder}/staging/updates/integration-stack/discovery/9.0.0.Alpha2/ -JBDS"
 
   echo ""
   exit 1
@@ -33,8 +33,8 @@ while [[ "$#" -gt 0 ]]; do
   case $1 in
     '-DESTINATION') DESTINATION="$2"; shift 1;; # override for JBDS publishing, eg., /qa/services/http/binaries/RHDS
     '-JBDS') DESTINATION="${JBDS}"; shift 0;; # shortcut
-    '-v','-version') version="$2"; shift 1;;
-    '-vr','-versionWithRespin') versionWithRespin="$2"; shift 1;;
+    '-v'|'-version') version="$2"; shift 1;;
+    '-vr'|'-versionWithRespin') versionWithRespin="$2"; shift 1;;
     '-is') ISsite="$2"; shift 1;;
     '-q') qualities="$qualities $2"; shift 1;;
     *) OTHERFLAGS="${OTHERFLAGS} $1"; shift 0;;
@@ -44,43 +44,46 @@ done
 
 if [[ $DESTINATION = $TOOLS ]]; then
   directoryXML=jbosstools-directory.xml
-  destinationURL=http://download.jboss.org/jbosstools/mars
+  rootFolder=mars
+  destinationURL=http://download.jboss.org/jbosstools/${rootFolder}
 else
   directoryXML=devstudio-directory.xml
-  destinationURL=https://devstudio.redhat.com/9.0
+  rootFolder=9.0
+  destinationURL=https://devstudio.redhat.com/${rootFolder}
 fi  
 for quality in ${qualities}; do
   tmpdir=/tmp/merge_${quality}_IS_plugins_to_${directoryXML}; mkdir -p $tmpdir; pushd $tmpdir >/dev/null
     # get plugin jar xml
     wget ${ISsite}/${directoryXML} --no-check-certificate -q -O - | grep integration-stack > $tmpdir/pluginXML.fragment.txt
     # if [[ -f $tmpdir/pluginXML.fragment.txt ]]; then cat $tmpdir/pluginXML.fragment.txt; fi # debugging
     # echo "" # debugging
-    mkdir -p 9.0/${quality}/updates/discovery.central/${versionWithRespin}/plugins/
-    pushd 9.0/${quality}/updates/discovery.central/${versionWithRespin}/plugins/ >/dev/null
+    # echo "[INFO] versionWithRespin = ${versionWithRespin}" # debugging
+    mkdir -p ${rootFolder}/${quality}/updates/discovery.central/${versionWithRespin}/plugins/
+    pushd ${rootFolder}/${quality}/updates/discovery.central/${versionWithRespin}/plugins/ >/dev/null
       # get plugin jars names/paths
       plugins=$(cat $tmpdir/pluginXML.fragment.txt | sed "s#.\+url=\"\(.\+\.jar\)\".\+#\1#")
       # get plugin jars into discovery.central
       for plugin in $plugins; do wget ${ISsite}/${plugin} --no-check-certificate -q && echo "[INFO] $plugin"; done
     popd >/dev/null
     # copy into discovery.earlyaccess
-    mkdir -p 9.0/${quality}/updates/discovery.earlyaccess/${versionWithRespin}/plugins/
-    rsync -aq 9.0/${quality}/updates/discovery.central/${versionWithRespin}/plugins/*.jar 9.0/${quality}/updates/discovery.earlyaccess/${versionWithRespin}/plugins/
+    mkdir -p ${rootFolder}/${quality}/updates/discovery.earlyaccess/${versionWithRespin}/plugins/
+    rsync -aq ${rootFolder}/${quality}/updates/discovery.central/${versionWithRespin}/plugins/*.jar ${rootFolder}/${quality}/updates/discovery.earlyaccess/${versionWithRespin}/plugins/
     echo ""
     # get JBDS discovery site XML - both discovery.central and discovery.earlyaccess
     echo "[INFO] Verify changes here:"
     for disco in discovery.central discovery.earlyaccess; do
-      pushd 9.0/${quality}/updates/${disco}/${versionWithRespin}/ >/dev/null
-        rsync -aqrz --rsh=ssh --protocol=28 ${DESTINATION}/9.0/${quality}/updates/${disco}/${versionWithRespin}/${directoryXML} ./
+      pushd ${rootFolder}/${quality}/updates/${disco}/${versionWithRespin}/ >/dev/null
+        rsync -aqrz --rsh=ssh --protocol=28 ${DESTINATION}/${rootFolder}/${quality}/updates/${disco}/${versionWithRespin}/${directoryXML} ./
         # merge pluginXML fragment into ${directoryXML}
         sed -i "/<\/directory>/d" ${directoryXML} # remove closing tag
         sed -i "/.\+integration-stack.\+/d" ${directoryXML} # remove any existing plugins
-        cat $tmpdir/pluginXML.fragment.txt >> ${directoryXML}
+        cat $tmpdir/pluginXML.fragment.txt | sed -e "s#earlyaccess/plugins/#plugins/#">> ${directoryXML}
         echo "</directory>" >> ${directoryXML} # add closing tag back on
         # echo ""; echo "`pwd` / ${directoryXML} :"; cat ${directoryXML}; echo "" # debugging
         #ls -l `pwd`/${directoryXML} `pwd`/plugins # debugging
 
         # push new plugins and updated xml to DESTINATION 
-        rsync -aqrz --rsh=ssh --protocol=28 ./* ${DESTINATION}/9.0/${quality}/updates/${disco}/${versionWithRespin}/
+        rsync -aqrz --rsh=ssh --protocol=28 ./* ${DESTINATION}/${rootFolder}/${quality}/updates/${disco}/${versionWithRespin}/
 
         echo " >> ${destinationURL}/${quality}/updates/${disco}/${versionWithRespin}/${directoryXML}"
         echo " >> ${destinationURL}/${quality}/updates/${disco}/${versionWithRespin}/plugins/"