Grails Shell: using BuildSettings.GRAILS_APP_DIR to load config files

graceframework · May 23, 2023 · ac71932 · ac71932
1 parent 4782a29
commit ac71932
Showing 1 changed file with 8 additions and 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
@@ -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
     }