From ac71932237ee5dd86994ef6fd7f6f621c32b1e05 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 23 May 2023 15:44:53 +0800 Subject: [PATCH] Grails Shell: using BuildSettings.GRAILS_APP_DIR to load config files --- .../groovy/org/grails/cli/GrailsCli.groovy | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy b/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy index 501e5bab6f..7bc3e5c74f 100644 --- a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy +++ b/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy @@ -267,7 +267,7 @@ class GrailsCli { Environment.reset() } - boolean grailsAppDirPresent = new File('grails-app').exists() || new File('app').exists() + boolean grailsAppDirPresent = BuildSettings.GRAILS_APP_DIR_PRESENT File applicationGroovy = new File('Application.groovy') File profileYml = new File('profile.yml') if (!grailsAppDirPresent && !applicationGroovy.exists() && !profileYml.exists()) { @@ -628,15 +628,13 @@ class GrailsCli { private CodeGenConfig loadApplicationConfig() { CodeGenConfig config = new CodeGenConfig() - ['grails-app', 'app'].each { String dir -> - File applicationYml = new File(dir + '/conf/application.yml') - File applicationGroovy = new File(dir + '/conf/application.groovy') - if (applicationYml.exists()) { - config.loadYml(applicationYml) - } - if (applicationGroovy.exists()) { - config.loadGroovy(applicationGroovy) - } + File applicationYml = new File(BuildSettings.GRAILS_APP_DIR, 'conf/application.yml') + File applicationGroovy = new File(BuildSettings.GRAILS_APP_DIR, 'conf/application.groovy') + if (applicationYml.exists()) { + config.loadYml(applicationYml) + } + if (applicationGroovy.exists()) { + config.loadGroovy(applicationGroovy) } config }