X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=d8e439de5b0dcaabf7f38d76c0cf8f8529d9c279;hb=7782b7e4df32b283c92f08e70c3cf64c69a43fcd;hp=aab8e9a5c7eb4b9d6d1b41acce7939b14681544a;hpb=6266daf3965402077cb14e8997b20695657394db;p=goredo.git diff --git a/run.go b/run.go index aab8e9a..d8e439d 100644 --- a/run.go +++ b/run.go @@ -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)