(grails-forge) 01/02: fix distribution to be compatible with sdkman

[jdaugherty]

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch cli-fix
in repository https://gitbox.apache.org/repos/asf/grails-forge.git

commit 1ea6f3e31678a933fb99beb87e07c267e404a9e8
Author: James Daugherty <jdaughe...@jdresources.net>
AuthorDate: Wed Jun 11 09:14:38 2025 -0400

    fix distribution to be compatible with sdkman
---
 .github/workflows/gradle.yml |  2 +-
 grails-cli/build.gradle      | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9bd3ac9..ec05271 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -55,7 +55,7 @@ jobs:
           cp grails-cli/build/distributions/apache-grails-*.zip cli.zip
           unzip cli -d tmp1
           mv tmp1/apache-grails-* tmp1/cli
-          ./tmp1/cli/grails --version
+          ./tmp1/cli/bin/grails --version
       - name: "📤 Upload CLI Zip to Workflow Summary Page"
         if: ${{ matrix.java == '17' }}
         uses: actions/upload-artifact@v4
diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle
index 2a7b890..94c1aaa 100644
--- a/grails-cli/build.gradle
+++ b/grails-cli/build.gradle
@@ -143,11 +143,9 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
     doLast {
         t.unixScript.text = t.unixScript.text
                 .replace('$APP_HOME/lib/', 
"\$APP_HOME/.grails/$grailsVersion/")
-                .replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
 
         t.windowsScript.text = t.windowsScript.text
                 .replace('%APP_HOME%\\lib\\', 
"%APP_HOME%\\.grails\\$grailsVersion\\")
-                .replace('%DIRNAME%..', '%DIRNAME%')
     }
 }
 
@@ -156,26 +154,26 @@ 
project.extensions.getByType(DistributionContainer).configureEach {
     it.distributionClassifier.set('incubating-bin')
     it.contents {
         from(shadowJarTask) {
-            into ".grails/$grailsVersion"
+            into "bin/.grails/$grailsVersion"
         }
 
         from(cliStartScripts) {
-            into ''
+            into 'bin'
             fileMode = 0755
         }
 
         from(shellCliStartScripts) {
-            into ''
+            into 'bin'
             fileMode = 0755
         }
 
         from(forgeCliStartScripts) {
-            into ''
+            into 'bin'
             fileMode = 0755
         }
 
         
from(rootProject.project(':grails-forge-cli').layout.buildDirectory.file('exploded/bin/grails_forge_cli_completion'))
 {
-            into ''
+            into 'bin'
             fileMode = 0755
         }