[gradle] do not define settings.gradle if at default location. Fixes #26

kordamp · Oct 6, 2020 · b3a3e53 · b3a3e53
1 parent 981e37c
commit b3a3e53
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/gum/gradle.go b/gum/gradle.go
@@ -32,6 +32,7 @@ type GradleCommand struct {
 	executable           string
 	args                 *ParsedArgs
 	explicitProjectDir   string
+	rootDir              string
 	buildFile            string
 	explicitBuildFile    string
 	rootBuildFile        string
@@ -95,8 +96,14 @@ func (c *GradleCommand) doConfigureGradle() {
 				banner = append(banner, "with settings at '"+c.explicitSettingsFile+"':")
 			}
 		} else if len(c.settingsFile) > 0 {
-			args = append(args, "-c")
-			args = append(args, c.settingsFile)
+			pwd, _ := filepath.Abs(c.context.GetWorkingDir())
+			settingsDir, _ := filepath.Abs(filepath.Dir(c.settingsFile))
+
+			if c.rootDir != settingsDir || c.rootDir != pwd {
+				args = append(args, "-c")
+				args = append(args, c.settingsFile)
+			}
+
 			if !buildFileSet {
 				banner = append(banner, "with settings at '"+c.settingsFile+"':")
 			}
@@ -201,6 +208,7 @@ func FindGradle(context Context, args *ParsedArgs) *GradleCommand {
 			config:             config,
 			executable:         executable,
 			args:               args,
+			rootDir:            rootdir,
 			explicitProjectDir: explicitProjectDir}
 	}
 
@@ -211,6 +219,7 @@ func FindGradle(context Context, args *ParsedArgs) *GradleCommand {
 				config:               config,
 				executable:           executable,
 				args:                 args,
+				rootDir:              rootdir,
 				explicitBuildFile:    explicitBuildFile,
 				explicitSettingsFile: explicitSettingsFile}
 		}
@@ -219,6 +228,7 @@ func FindGradle(context Context, args *ParsedArgs) *GradleCommand {
 			config:            config,
 			executable:        executable,
 			args:              args,
+			rootDir:           rootdir,
 			explicitBuildFile: explicitBuildFile,
 			settingsFile:      settingsFile}
 	}
@@ -238,6 +248,7 @@ func FindGradle(context Context, args *ParsedArgs) *GradleCommand {
 				config:               config,
 				executable:           executable,
 				args:                 args,
+				rootDir:              rootdir,
 				buildFile:            buildFile,
 				rootBuildFile:        rootBuildFile,
 				explicitSettingsFile: explicitSettingsFile}
@@ -261,6 +272,7 @@ func FindGradle(context Context, args *ParsedArgs) *GradleCommand {
 		config:               config,
 		executable:           executable,
 		args:                 args,
+		rootDir:              rootdir,
 		buildFile:            buildFile,
 		rootBuildFile:        rootBuildFile,
 		settingsFile:         settingsFile,
@@ -286,7 +298,9 @@ func resolveGradleRootDir(context Context,
 	} else if context.FileExists(settingsFile) {
 		return filepath.Dir(settingsFile)
 	}
-	return filepath.Dir(buildFile)
+
+	dir, _ := filepath.Abs(filepath.Dir(buildFile))
+	return dir
 }
 
 func resolveGradleWrapperExecutable(context Context, args *ParsedArgs) (string, error) {

diff --git a/gum/jbang.go b/gum/jbang.go
@@ -103,6 +103,7 @@ func (c *JbangCommand) doExecuteJbang() {
 func (c *JbangCommand) debugJbang(config *Config, oargs []string) {
 	if c.config.general.debug {
 		fmt.Println("discovery          = ", config.jbang.discovery)
+		fmt.Println("pwd                = ", c.context.GetWorkingDir())
 		fmt.Println("sourceFile         = ", c.sourceFile)
 		fmt.Println("explicitSourceFile = ", c.explicitSourceFile)
 		fmt.Println("original args      = ", oargs)