X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=bd82de25075e2514f81be9477212712ddc7f96e6;hb=8d2ac7eab48109db94e73368f4e980066b291b55;hp=42d83beb0fddb14f15a3f5addb8181b5c362c7f1;hpb=634ee31ae35a2eaac517e0ffa1b7caede4b27ac5;p=goredo.git

diff --git a/main.go b/main.go
index 42d83be..bd82de2 100644
--- a/main.go
+++ b/main.go
@@ -28,9 +28,9 @@ import (
 	"path"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/sys/unix"
 )
 
 var (
@@ -59,7 +59,7 @@ func mustParseFd(v, name string) *os.File {
 func main() {
 	version := flag.Bool("version", false, "print version")
 	warranty := flag.Bool("warranty", false, "print warranty information")
-	symlinks := flag.Bool("symlinks", false, "create necessary symlinks in current direcotyr")
+	symlinks := flag.Bool("symlinks", false, "create necessary symlinks in current directory")
 
 	flag.Usage = usage
 	flag.Parse()
@@ -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)
@@ -93,17 +95,18 @@ func main() {
 	log.SetFlags(0)
 
 	var err error
-	Cwd, err = unix.Getwd()
+	Cwd, err = os.Getwd()
 	if err != nil {
 		panic(err)
 	}
 
 	NoColor = os.Getenv(EnvNoColor) != ""
-	NoHash = os.Getenv(EnvNoHash) == "1"
 	NoSync = os.Getenv(EnvNoSync) == "1"
 
 	TopDir = os.Getenv(EnvTopDir)
-	if TopDir != "" {
+	if TopDir == "" {
+		TopDir = "/"
+	} else {
 		TopDir, err = filepath.Abs(TopDir)
 		if err != nil {
 			panic(err)
@@ -140,10 +143,14 @@ func main() {
 	if Debug || os.Getenv(EnvLogPid) == "1" {
 		MyPid = os.Getpid()
 	}
+	var traced bool
+	if *flagTraceAll {
+		mustSetenv(EnvTrace, "1")
+	}
 	if *flagTrace {
-		Trace = true
+		traced = true
 	} else {
-		Trace = os.Getenv(EnvTrace) == "1"
+		traced = os.Getenv(EnvTrace) == "1"
 	}
 
 	// Those are internal envs
@@ -162,6 +169,7 @@ func main() {
 		fdDep = mustParseFd(v, EnvDepFd)
 	}
 	BuildUUID = os.Getenv(EnvBuildUUID)
+	tgts := flag.Args()
 	if BuildUUID == "" {
 		raw := new([16]byte)
 		if _, err = io.ReadFull(rand.Reader, raw[:]); err != nil {
@@ -172,12 +180,18 @@ func main() {
 			"%x-%x-%x-%x-%x",
 			raw[0:4], raw[4:6], raw[6:8], raw[8:10], raw[10:],
 		)
+		if len(tgts) == 0 {
+			tgts = []string{"all"}
+		}
 	}
+	statusInit()
 
-	tgts := flag.Args()
-	if len(tgts) == 0 {
-		tgts = []string{"all"}
+	for i, tgt := range tgts {
+		if path.IsAbs(tgt) {
+			tgts[i] = cwdMustRel(tgt)
+		}
 	}
+
 	ok := true
 	err = nil
 	cmdName := path.Base(os.Args[0])
@@ -186,10 +200,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 +231,8 @@ CmdSwitch:
 				break
 			}
 		}
+	case "redo-dot":
+		err = dotPrint(tgts)
 	case "redo-stamp":
 		if fdDep == nil {
 			log.Fatalln("no", EnvDepFd)
@@ -239,13 +259,16 @@ CmdSwitch:
 			break
 		}
 		os.Remove(fdTmp.Name())
-		var doFile string
 		cwd, tgt := cwdAndTgt(tgts[0])
-		doFile, _, err = findDo(fdTmp, cwd, tgt)
+		cwdRel := cwdMustRel(cwd)
+		doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
+		if err != nil {
+			break
+		}
+		_, err = fdTmp.Seek(0, 0)
 		if err != nil {
 			break
 		}
-		fdTmp.Seek(0, 0)
 		r := recfile.NewReader(fdTmp)
 		for {
 			m, err := r.NextMap()
@@ -255,13 +278,13 @@ 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"]))
+		}
+		if doFile == "" {
+			ok = false
+		} else {
+			fmt.Println(path.Join(cwdRel, strings.Repeat("..", upLevels), doFile))
 		}
-		ok = doFile != ""
 	default:
 		log.Fatalln("unknown command", cmdName)
 	}