Merge pull request #964 from slide/gh_954

Fix install-plugins.sh for update-center changes
jenkinsci · Aug 28, 2020 · d5dc7f1 · d5dc7f1
2 parents 2be1a3c + 778e387
commit d5dc7f1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/install-plugins.sh b/install-plugins.sh
@@ -243,10 +243,11 @@ main() {
     echo "Registering preinstalled plugins..."
     installedPlugins="$(installedPlugins)"
 
-    # Check if there's a version-specific update center, which is the case for LTS versions
+    # Get the update center URL based on the jenkins version
     jenkinsVersion="$(jenkinsMajorMinorVersion)"
-    if curl -fsL -o /dev/null "$JENKINS_UC/$jenkinsVersion"; then
-        JENKINS_UC_LATEST="$JENKINS_UC/$jenkinsVersion"
+    jenkinsUcJson=$(curl -Ls -o /dev/null -w "%{url_effective}" "${JENKINS_UC}/update-center.json?version=${jenkinsVersion}")
+    if [ -n "${jenkinsUcJson}" ]; then
+        JENKINS_UC_LATEST=${jenkinsUcJson//update-center.json/}
         echo "Using version-specific update center: $JENKINS_UC_LATEST..."
     else
         JENKINS_UC_LATEST=