commit 8f4ab7a027d6bab6a648cbd5aa5ade4d2fb8b0f3
author Ed Willink <ed@willink.me.uk> Mon Sep 09 19:20:47 2019 +0100
committer Ed Willink <ed@willink.me.uk> Mon Sep 09 19:20:47 2019 +0100
tree 84d5989e2bd39ee7be3b786b1fb6a0bac32dc967
parent c6c64809fe2d7a2d664ebf2b332bf0fa459d9bce

[releng] Avoid absolute composite repo references

releng/org.eclipse.qvto.releng.build-site/updates.sh

diff --git a/releng/org.eclipse.qvto.releng.build-site/updates.sh b/releng/org.eclipse.qvto.releng.build-site/updates.sh
index bcdab5b..7fdbe8b 100644
--- a/releng/org.eclipse.qvto.releng.build-site/updates.sh
+++ b/releng/org.eclipse.qvto.releng.build-site/updates.sh
@@ -15,7 +15,7 @@
 #    -u PUBLISH__URL            The zip to be published e.g. https://ci.eclipse.org/qvt-oml/job/qvto-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/org.eclipse.qvto-3.9.0.v20171025-1600.zip
 #    -v PUBLISH__VERSION        Unqualified version e.g. 3.9.0
 #    -t PUBLISH__BUILD_T        Build type N/I/S/R, blank suppresses promotion
-#    -q PUBLISH__QUALIFIER        Version qualifier e.g. v20171025-1600
+#    -q PUBLISH__QUALIFIER      Version qualifier e.g. v20171025-1600
 #
 updatesFolder="/home/data/httpd/download.eclipse.org/mmt/qvto/updates/"
 group="modeling.mmt.qvt-oml"
@@ -43,25 +43,25 @@
   then
     buildFolder="${updatesFolder}nightly"
     buildRepoName="Nightly"
-    externalFolder="${externalUpdatesFolder}nightly/${PUBLISH__VERSION}"
+    latestRelativeReference="../${PUBLISH__VERSION}"
   elif [ "${PUBLISH__BUILD_T}" = "I" ]
   then
     buildFolder="${updatesFolder}interim"
     buildRepoName="Interim"
-    externalFolder="${externalUpdatesFolder}interim/${PUBLISH__VERSION}"
+    latestRelativeReference="../${PUBLISH__VERSION}"
   elif [ "${PUBLISH__BUILD_T}" = "S" ]
   then
     buildFolder="${updatesFolder}milestones"
     buildRepoName="Milestones"
-    externalFolder="${externalUpdatesFolder}milestones/${PUBLISH__VERSION}/${tQualifier}"
+    latestRelativeReference="../${PUBLISH__VERSION}/${tQualifier}"
   elif [ "${PUBLISH__BUILD_T}" = "R" ]
   then
     buildFolder="${updatesFolder}releases"
-    buildRepoName="Release"
-    externalFolder="${externalUpdatesFolder}releases/${PUBLISH__VERSION}"
+    buildRepoName="Releases"
+    latestRelativeReference="../${PUBLISH__VERSION}"
   else
     buildFolder="${updatesFolder}other"
-    externalFolder="${externalUpdatesFolder}other/${PUBLISH__VERSION}"
+    latestRelativeReference="../${PUBLISH__VERSION}"
     buildRepoName="Other"
   fi
 
@@ -128,7 +128,7 @@
 
     mkdir ${buildFolder}/newlatest
     pushd ${buildFolder}/newlatest
-      ${manageComposite} add -Dchild.repository=${externalFolder} -Dcomposite.name="${projectRepoName} Latest ${PUBLISH__VERSION} ${buildRepoName} Repository"
+      ${manageComposite} add -Dchild.repository=${latestRelativeReference} -Dcomposite.name="${projectRepoName} Latest ${PUBLISH__VERSION} ${buildRepoName} Repository"
     popd
     if [ -d "latest" ]
     then