Make sure goal/tasks replacements can be disabled. Fixes #19

kordamp · Sep 16, 2020 · a1172cf · a1172cf
1 parent 0db4451
commit a1172cf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/gum/config.go b/gum/config.go
@@ -74,27 +74,19 @@ func newConfig() *Config {
 }
 
 func (c *Config) setQuiet(b bool) {
-	if b {
-		c.general.quiet = b
-	}
+	c.general.quiet = b
 }
 
 func (c *Config) setDebug(b bool) {
-	if b {
-		c.general.debug = b
-	}
+	c.general.debug = b
 }
 
 func (g *gradle) setReplace(b bool) {
-	if b {
-		g.replace = b
-	}
+	g.replace = b
 }
 
 func (m *maven) setReplace(b bool) {
-	if b {
-		m.replace = b
-	}
+	m.replace = b
 }
 
 func (c *Config) merge(other *Config) {

diff --git a/gum/flag.go b/gum/flag.go
@@ -44,15 +44,15 @@ func GrabFlag(f string, args []string) (bool, []string) {
 	return false, args
 }
 
-func findFlag(f string, args []string) bool {
+func findFlag(flag string, args []string) bool {
 	if len(args) == 0 {
 		// no args to be checked
 		return false
 	}
 
 	for i := range args {
 		s := args[i]
-		if s == f {
+		if flag == s {
 			return true
 		}
 	}

diff --git a/gum/gradle.go b/gum/gradle.go
@@ -51,11 +51,14 @@ func (c *GradleCommand) doConfigureGradle() {
 	banner := make([]string, 0)
 	banner = append(banner, "Using gradle at '"+c.executable+"'")
 	nearest, oargs := GrabFlag("-gn", c.args)
+	debugSet := findFlag("-gd", oargs)
 	debug, oargs := GrabFlag("-gd", oargs)
-	replaceSet := findFlag("-gr", args)
+	replaceSet := findFlag("-gr", oargs)
 	skipReplace, oargs := GrabFlag("-gr", oargs)
 
-	c.config.setDebug(debug)
+	if debugSet {
+		c.config.setDebug(debug)
+	}
 	if replaceSet {
 		c.config.gradle.setReplace(!skipReplace)
 	}

diff --git a/gum/jbang.go b/gum/jbang.go
@@ -48,9 +48,13 @@ func (c *JbangCommand) doConfigureJbang() {
 
 	banner := make([]string, 0)
 	banner = append(banner, "Using jbang at '"+c.executable+"'")
+
+	debugSet := findFlag("-gd", c.args)
 	debug, oargs := GrabFlag("-gd", c.args)
 
-	c.config.setDebug(debug)
+	if debugSet {
+		c.config.setDebug(debug)
+	}
 
 	if len(c.explicitSourceFile) > 0 {
 		banner = append(banner, "to run sourceFile '"+c.explicitSourceFile+"':")

diff --git a/gum/maven.go b/gum/maven.go
@@ -48,11 +48,14 @@ func (c *MavenCommand) doConfigureMaven() {
 	banner := make([]string, 0)
 	banner = append(banner, "Using maven at '"+c.executable+"'")
 	nearest, oargs := GrabFlag("-gn", c.args)
+	debugSet := findFlag("-gd", oargs)
 	debug, oargs := GrabFlag("-gd", oargs)
-	replaceSet := findFlag("-gr", args)
+	replaceSet := findFlag("-gr", oargs)
 	skipReplace, oargs := GrabFlag("-gr", oargs)
 
-	c.config.setDebug(debug)
+	if debugSet {
+		c.config.setDebug(debug)
+	}
 	if replaceSet {
 		c.config.maven.setReplace(!skipReplace)
 	}