X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=d8e439de5b0dcaabf7f38d76c0cf8f8529d9c279;hb=998062af6d715dd47fdc6f96f1588289e86c5a9b;hp=40fad74af0f20f98dc517020faca88c86df57359;hpb=edb601644735972fac3efcdc27849b5b9b1f5fb7;p=goredo.git

diff --git a/run.go b/run.go
index 40fad74..d8e439d 100644
--- a/run.go
+++ b/run.go
@@ -77,8 +77,6 @@ type RunErr struct {
 	Err      error
 }
 
-func (e RunErr) Unwrap() error { return e.Err }
-
 func (e *RunErr) Name() string {
 	var name string
 	if e.DoFile == "" {
@@ -268,12 +266,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Determine basename and DIRPREFIX
+	doFileRelPath := doFile
 	ents := strings.Split(cwd, "/")
 	ents = ents[len(ents)-upLevels:]
 	dirPrefix := path.Join(ents...)
 	cwdOrig := cwd
 	for i := 0; i < upLevels; i++ {
 		cwd = path.Join(cwd, "..")
+		doFileRelPath = path.Join("..", doFileRelPath)
 	}
 	cwd = path.Clean(cwd)
 	doFilePath := path.Join(cwd, doFile)
@@ -281,10 +281,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	runErr := RunErr{Tgt: tgtOrig}
 	if strings.HasPrefix(doFile, "default.") {
 		basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
-		runErr.DoFile = doFile
+		runErr.DoFile = doFileRelPath
 	}
 
-	if err = writeDep(fdDep, cwd, doFile); err != nil {
+	if err = writeDep(fdDep, cwdOrig, doFileRelPath); err != nil {
 		cleanup()
 		return TgtErr{tgtOrig, err}
 	}
@@ -327,6 +327,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	cmd := exec.Command(cmdName, args...)
 	cmd.Dir = cwd
 	cmd.Stdout = fdStdout
+	// cmd.Stdin reads from /dev/null by default
 	cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%d", EnvLevel, Level+1))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDirPrefix, dirPrefix))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvBuildUUID, BuildUUID))
@@ -379,7 +380,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 		fdStderr.Truncate(0)
 	}
-	shCtx := fmt.Sprintf("sh: %s: %s %s [%s]", tgtOrig, cmdName, args, cwd)
+	shCtx := fmt.Sprintf(
+		"sh: %s: %s %s cwd:%s dirprefix:%s",
+		tgtOrig, cmdName, args, cwd, dirPrefix,
+	)
 	trace(CDebug, "%s", shCtx)
 
 	Jobs.Add(1)