Skip to content

Commit e9624db

Browse files
committed
[skip ci] fix: setup cli distributions to just a lib directory to match sdkman expectations
1 parent 80ffc99 commit e9624db

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

grails-forge/grails-cli/build.gradle

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,6 @@ cliStartScripts.configure { CreateStartScripts t ->
8989
t.applicationName = 'grails'
9090
t.mainClass = project.findProperty('startMainClass') as String
9191
t.classpath = files(shadowJarTask)
92-
93-
// See gradle tickets such as for lib https://github.com/gradle/gradle/issues/7033
94-
doLast {
95-
t.unixScript.text = t.unixScript.text
96-
.replace('$APP_HOME/lib/', "\$APP_HOME/.grails/$projectVersion/")
97-
.replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
98-
99-
t.windowsScript.text = t.windowsScript.text
100-
.replace('%APP_HOME%\\lib\\', "%APP_HOME%\\.grails\\$projectVersion\\")
101-
.replace('%DIRNAME%..', '%DIRNAME%')
102-
}
10392
}
10493

10594
TaskProvider<CreateStartScripts> shellCliStartScripts = tasks.register('createShellCliStartScripts', CreateStartScripts)
@@ -109,17 +98,6 @@ shellCliStartScripts.configure { CreateStartScripts t ->
10998
t.applicationName = 'grails-shell-cli'
11099
t.mainClass = 'org.grails.cli.GrailsCli'
111100
t.classpath = files(shadowJarTask)
112-
113-
// See gradle tickets such as for lib https://github.com/gradle/gradle/issues/7033
114-
doLast {
115-
t.unixScript.text = t.unixScript.text
116-
.replace('$APP_HOME/lib/', "\$APP_HOME/.grails/${projectVersion}/")
117-
.replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
118-
119-
t.windowsScript.text = t.windowsScript.text
120-
.replace('%APP_HOME%\\lib\\', "%APP_HOME%\\.grails\\${projectVersion}\\")
121-
.replace('%DIRNAME%..', '%DIRNAME%')
122-
}
123101
}
124102

125103
TaskProvider<CreateStartScripts> forgeCliStartScripts = tasks.register('createForgeCliStartScripts', CreateStartScripts)
@@ -129,23 +107,14 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
129107
t.applicationName = 'grails-forge-cli'
130108
t.mainClass = 'org.grails.forge.cli.Application'
131109
t.classpath = files(shadowJarTask)
132-
133-
// See gradle tickets such as for lib https://github.com/gradle/gradle/issues/7033
134-
doLast {
135-
t.unixScript.text = t.unixScript.text
136-
.replace('$APP_HOME/lib/', "\$APP_HOME/.grails/$projectVersion/")
137-
138-
t.windowsScript.text = t.windowsScript.text
139-
.replace('%APP_HOME%\\lib\\', "%APP_HOME%\\.grails\\$projectVersion\\")
140-
}
141110
}
142111

143112
project.extensions.getByType(DistributionContainer).configureEach {
144113
it.distributionBaseName.set('apache-grails')
145114
it.distributionClassifier.set('incubating-bin')
146115
it.contents {
147116
from(shadowJarTask) {
148-
into "bin/.grails/$projectVersion"
117+
into "lib"
149118
}
150119

151120
from(cliStartScripts) {

0 commit comments

Comments
 (0)