Grails Bootstrap: adding new BuildSettings.GRAILS_APP_PATH property, …

…it may be 'app' or 'grails-app' as default.
graceframework · May 25, 2023 · a6f6d1c · a6f6d1c
1 parent 0adeb49
commit a6f6d1c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -204,6 +204,11 @@ class BuildSettings {
      */
     public static final File GRAILS_APP_DIR
 
+    /**
+     * The Path of the Grails app directory
+     */
+    public static final String GRAILS_APP_PATH
+
     /**
      * Whether the application is running inside the development environment or deployed
      */
@@ -268,14 +273,12 @@ class BuildSettings {
             if (new File(BASE_DIR, 'app').exists()) {
                 GRAILS_APP_DIR = new File(BASE_DIR, 'app')
             }
-            else if (new File(BASE_DIR, 'grails-app').exists()) {
-                GRAILS_APP_DIR = new File(BASE_DIR, 'grails-app')
-            }
             else {
-                GRAILS_APP_DIR = null
+                GRAILS_APP_DIR = new File(BASE_DIR, 'grails-app')
             }
         }
-        GRAILS_APP_DIR_PRESENT = GRAILS_APP_DIR?.exists()
+        GRAILS_APP_PATH = GRAILS_APP_DIR.absolutePath.substring(GRAILS_APP_DIR.absolutePath.lastIndexOf(File.separator) + 1)
+        GRAILS_APP_DIR_PRESENT = GRAILS_APP_DIR.exists()
 
         String projectTargetDir = System.getProperty(PROJECT_TARGET_DIR)
         if (projectTargetDir) {