From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 1 Mar 2022 19:35:48 +0000 (+0300)
Subject: redo-ifchange -f is not a common option
X-Git-Tag: v1.24.0~1
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=a57de8f95c4e9d7998f3c777bd58eca8f9415f37

redo-ifchange -f is not a common option
---

diff --git a/main.go b/main.go
index 3cc1a8f..bfebadf 100644
--- a/main.go
+++ b/main.go
@@ -87,7 +87,6 @@ func CmdName() string {
 }
 
 func main() {
-	forcedIfchange := flag.Bool("f", false, "forced redo-ifchange")
 	version := flag.Bool("version", false, "print version")
 	warranty := flag.Bool("warranty", false, "print warranty information")
 
@@ -336,7 +335,7 @@ CmdSwitch:
 			}
 		}
 	case CmdNameRedoIfchange:
-		ok, err = ifchange(tgts, *forcedIfchange, traced)
+		ok, err = ifchange(tgts, *flagForcedIfchange, traced)
 		if err == nil {
 			err = depsWrite(fdDep, tgts)
 		}
diff --git a/run.go b/run.go
index 3662405..32e3800 100644
--- a/run.go
+++ b/run.go
@@ -69,10 +69,11 @@ var (
 	StopIfMod    = false
 	Jobs         sync.WaitGroup
 
-	flagTrace        *bool
-	flagTraceAll     *bool
-	flagStderrKeep   *bool
-	flagStderrSilent *bool
+	flagTrace          *bool
+	flagTraceAll       *bool
+	flagStderrKeep     *bool
+	flagStderrSilent   *bool
+	flagForcedIfchange *bool
 
 	TracedAll bool
 
@@ -94,6 +95,7 @@ func init() {
 		fmt.Sprintf("keep job's stderr (%s=1)", EnvStderrKeep))
 	flagStderrSilent = flag.Bool("s", false,
 		fmt.Sprintf("silent, do not print job's stderr (%s=1)", EnvStderrSilent))
+	flagForcedIfchange = flag.Bool("f", false, "forced redo-ifchange")
 }
 
 type RunError struct {