Move tai64nlocal to tai64n module

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 42d83beb0fddb14f15a3f5addb8181b5c362c7f1..818b8dafeb830d85300c397107020572bfe0c32f 100644 (file)
--- a/main.go
+++ b/main.go
@@ -77,12 +77,14 @@ func main() {
                        "redo",
                        "redo-always",
                        "redo-cleanup",
+                       "redo-dot",
                        "redo-ifchange",
                        "redo-ifcreate",
                        "redo-log",
                        "redo-stamp",
                        "redo-whichdo",
                } {
+                       fmt.Println(os.Args[0], "<-", cmdName)
                        if err := os.Symlink(os.Args[0], cmdName); err != nil {
                                rc = 1
                                log.Println(err)
@@ -99,7 +101,6 @@ func main() {
        }
 
        NoColor = os.Getenv(EnvNoColor) != ""
-       NoHash = os.Getenv(EnvNoHash) == "1"
        NoSync = os.Getenv(EnvNoSync) == "1"
 
        TopDir = os.Getenv(EnvTopDir)
@@ -140,10 +141,11 @@ func main() {
        if Debug || os.Getenv(EnvLogPid) == "1" {
                MyPid = os.Getpid()
        }
+       var traced bool
        if *flagTrace {
-               Trace = true
+               traced = true
        } else {
-               Trace = os.Getenv(EnvTrace) == "1"
+               traced = os.Getenv(EnvTrace) == "1"
        }
 
        // Those are internal envs
@@ -173,6 +175,7 @@ func main() {
                        raw[0:4], raw[4:6], raw[6:8], raw[8:10], raw[10:],
                )
        }
+       statusInit()
 
        tgts := flag.Args()
        if len(tgts) == 0 {
@@ -186,10 +189,14 @@ func main() {
 CmdSwitch:
        switch cmdName {
        case "redo":
-               Force = true
-               ok, err = ifchange(tgts)
+               for _, tgt := range tgts {
+                       ok, err = ifchange([]string{tgt}, true, traced)
+                       if err != nil || !ok {
+                               break
+                       }
+               }
        case "redo-ifchange":
-               ok, err = ifchange(tgts)
+               ok, err = ifchange(tgts, false, traced)
                writeDeps(fdDep, tgts)
        case "redo-ifcreate":
                if fdDep == nil {
@@ -213,6 +220,8 @@ CmdSwitch:
                                break
                        }
                }
+       case "redo-dot":
+               err = dotPrint(tgts)
        case "redo-stamp":
                if fdDep == nil {
                        log.Fatalln("no", EnvDepFd)
@@ -245,7 +254,10 @@ CmdSwitch:
                if err != nil {
                        break
                }
-               fdTmp.Seek(0, 0)
+               _, err = fdTmp.Seek(0, 0)
+               if err != nil {
+                       break
+               }
                r := recfile.NewReader(fdTmp)
                for {
                        m, err := r.NextMap()
@@ -255,11 +267,7 @@ CmdSwitch:
                                }
                                break CmdSwitch
                        }
-                       rel, err := filepath.Rel(Cwd, path.Join(cwd, m["Target"]))
-                       if err != nil {
-                               panic(err)
-                       }
-                       fmt.Println(rel)
+                       fmt.Println(cwdMustRel(cwd, m["Target"]))
                }
                ok = doFile != ""
        default: