Prepare for release

[goredo.git] / main.go

diff --git a/main.go b/main.go
index c579a0f6ec935414ff18815fa3eaf0aea62ebcb1..d795544fe64a9b0a793aa724770380cb9e5d6ef0 100644 (file)
--- a/main.go
+++ b/main.go
@@ -98,7 +98,18 @@ func main() {
        }
 
        flag.Usage = func() { usage(os.Args[0]) }
-       flag.Parse()
+
+       BuildUUIDStr := os.Getenv(EnvBuildUUID)
+       IsTopRedo = BuildUUIDStr == ""
+
+       var args []string
+       if IsTopRedo {
+               flag.Parse()
+               args = flag.Args()
+       } else {
+               args = os.Args[1:]
+       }
+
        if *warranty {
                fmt.Println(Warranty)
                return
@@ -279,13 +290,12 @@ func main() {
                fdDep = mustParseFd(v, EnvDepFd)
        }
 
-       tgts := make([]*Tgt, 0, len(flag.Args()))
-       for _, arg := range flag.Args() {
+       tgts := make([]*Tgt, 0, len(args))
+       for _, arg := range args {
                tgts = append(tgts, NewTgt(arg))
        }
        tgtsWasEmpty := len(tgts) == 0
-       if BuildUUIDStr := os.Getenv(EnvBuildUUID); BuildUUIDStr == "" {
-               IsTopRedo = true
+       if BuildUUIDStr == "" {
                BuildUUID = uuid.New()
                if tgtsWasEmpty {
                        tgts = append(tgts, NewTgt("all"))
@@ -561,7 +571,7 @@ func main() {
                                })
                                fields = append(fields, Inode(meta[:InodeLen]).RecfileFields()...)
                                err = recfileWrite(w, fields...)
-                       case DepTypeIfchangeDummy:
+                       case DepTypeIfchangeNonex:
                                err = recfileWrite(w, []recfile.Field{
                                        {Name: "Type", Value: "ifchange"},
                                        {Name: "Target", Value: string(chunk)},