Fixed broken download links

Fixes grails/grails-core#13144
grails · Oct 11, 2023 · 3ded1ff · 3ded1ff
1 parent 40fe023
commit 3ded1ff
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/buildSrc/src/main/groovy/org/grails/documentation/SiteMap.groovy b/buildSrc/src/main/groovy/org/grails/documentation/SiteMap.groovy
@@ -25,6 +25,22 @@ class SiteMap {
         stableVersions(releases).reverse().drop(1).collect { it.versionText }
     }
 
+    static List<String> versionsBeforeGrails6(File releases) {
+        stableVersions(releases)
+                .findAll { version -> version.major < 6 }
+                .reverse()
+                .drop(1)
+                .collect { it.versionText }
+    }
+
+    static List<String> versionsAfterGrails6(File releases) {
+        stableVersions(releases)
+                .findAll { version -> version.major >= 6 }
+                .reverse()
+                .drop(1)
+                .collect { it.versionText }
+    }
+
     static List<SoftwareVersion> stableVersions(File releases) {
         (versions(releases).findAll { SoftwareVersion softwareVersion ->
             !softwareVersion.isSnapshot()

diff --git a/buildSrc/src/main/groovy/org/grails/gradle/RenderSiteTask.groovy b/buildSrc/src/main/groovy/org/grails/gradle/RenderSiteTask.groovy
@@ -69,8 +69,9 @@ class RenderSiteTask extends DefaultTask {
         File o = output.get()
         File releasesFile = releases.get()
         SoftwareVersion latest = SiteMap.latestVersion(releasesFile)
-        List<String> olderVersions = SiteMap.olderVersions(releasesFile).reverse()
-        String versions = olderVersions.collect {version -> "<option>${version}</option>" }.join(' ')
+        List<String> versionsBeforeGrails6 = SiteMap.versionsBeforeGrails6(releasesFile).reverse()
+        List<String> versionsAfterGrails6 = SiteMap.versionsAfterGrails6(releasesFile).reverse()
+        String versions = versionsBeforeGrails6.collect {version -> "<option>${version}</option>" }.join(' ')
         Map<String, String> m = siteMeta(title.get(),
                 about.get(),
                 url.get(),
@@ -90,7 +91,7 @@ class RenderSiteTask extends DefaultTask {
                                         List<String> keywords,
                                         String robots,
                                         String latest,
-                                        String versions
+                                        String versionsBeforeGrails6
     ) {
         String eventsHtml = ""
         if (System.getenv("AIRTABLE_API_KEY") != null && System.getenv("AIRTABLE_BASE_ID") != null) {
@@ -110,7 +111,7 @@ class RenderSiteTask extends DefaultTask {
                 url: url,
                 latest: latest,
                 events: eventsHtml,
-                versions: versions,
+                versions: versionsBeforeGrails6,
                 keywords: keywords.join(','),
                 robots: robots,
         ] as Map<String, String>

diff --git a/pages/download.html b/pages/download.html
@@ -22,7 +22,7 @@ <h2>Download the Grails<sup>&reg;</sup> framework [%latest]</h2>
                     <a href='https://github.com/grails/grails-core/releases/tag/v[%latest]'>Release Notes</a>
                 </li>
                 <li>
-                    <a href='https://github.com/grails/grails-core/releases/download/v[%latest]/grails-[%latest].zip'>Binary</a>
+                    <a href='https://github.com/grails/grails-forge/releases/download/v[%latest]/grails-cli-[%latest].zip'>Binary</a>
                 </li>
                 <li>
                     <a href='https://github.com/grails/grails-doc/releases/download/v[%latest]/grails-docs.zip'>Documentation</a>
@@ -66,7 +66,7 @@ <h3 class='columnheader'>Installing with SDKMAN!</h3>
                 </div>
                 <p>If prompted, make this your default version. After installation is complete it can be tested with:</p>
                 <div class='code'>
-                    <p>$ grails -version</p>
+                    <p>$ grails --version</p>
                 </div>
                 <p>That's all there is to it!</p>
             </article>