X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=512418b6e448206ba58c1bd7f3e366197c67bd78;hb=56ee2c6661bab9f6d91cac6aca09676b51492ed7;hp=ac607a696b0ceea461d0147e9ef555ad8f663f59;hpb=7e3898c0b58d68b5287f3437f721f967809de2a9;p=goredo.git

diff --git a/run.go b/run.go
index ac607a6..512418b 100644
--- a/run.go
+++ b/run.go
@@ -28,6 +28,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
@@ -62,7 +63,8 @@ var (
 	StderrPrefix string
 	Jobs         sync.WaitGroup
 
-	flagTrace        = flag.Bool("x", false, fmt.Sprintf("trace current target (sh -x) (set %s=1 for all others)", EnvTrace))
+	flagTrace        = flag.Bool("x", false, "trace (sh -x) current targets")
+	flagTraceAll     = flag.Bool("xx", false, fmt.Sprintf("trace (sh -x) all targets (%s=1)", EnvTrace))
 	flagStderrKeep   = flag.Bool("logs", false, fmt.Sprintf("keep job's stderr (%s=1)", EnvStderrKeep))
 	flagStderrSilent = flag.Bool("silent", false, fmt.Sprintf("do not print job's stderr (%s=1)", EnvStderrSilent))
 )
@@ -305,13 +307,22 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Temporary file for stdout
-	fdStdout, err := tempfile(cwd, tgt)
+	fdStdout, err := tempfile(cwdOrig, tgt)
 	if err != nil {
 		cleanup()
 		return TgtErr{tgtOrig, err}
 	}
 	tmpPath := fdStdout.Name() + ".3" // and for $3
-	args = append(args, tgt, basename, path.Base(tmpPath))
+	tmpPathRel, err := filepath.Rel(cwd, tmpPath)
+	if err != nil {
+		panic(err)
+	}
+	args = append(
+		args,
+		path.Join(dirPrefix, tgt),
+		path.Join(dirPrefix, basename),
+		tmpPathRel,
+	)
 
 	cmd := exec.Command(cmdName, args...)
 	cmd.Dir = cwd
@@ -447,14 +458,16 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 
 		// Was $1 touched?
-		if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
-			ts, err := fileCtime(fd)
-			fd.Close()
-			if err == nil && ts != tsPrev {
-				runErr.Err = errors.New("$1 was explicitly touched")
-				errs <- runErr
+		if tsPrev != "" {
+			if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+				ts, err := fileCtime(fd)
 				fd.Close()
-				return
+				if err == nil && ts != tsPrev {
+					runErr.Err = errors.New("$1 was explicitly touched")
+					errs <- runErr
+					fd.Close()
+					return
+				}
 			}
 		}
 
@@ -494,6 +507,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 
 		// Do we need to ifcreate it, of ifchange with renaming?
 		if fd == nil {
+			os.Remove(path.Join(cwdOrig, tgt))
 			err = ifcreate(fdDep, tgt)
 			if err != nil {
 				goto Finish