X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=e40ad1d5d5e4b65a262ea385b4a0e10df3274fa6;hb=b2eef1c806af5802089517b8c86abc65edfe574d;hp=93c837d9fb458dca6c4bffbe62c120da60aa387f;hpb=66de71f560cd772e7ef9e9cf1182ce67e495b1ec;p=goredo.git

diff --git a/run.go b/run.go
index 93c837d..e40ad1d 100644
--- a/run.go
+++ b/run.go
@@ -29,7 +29,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -63,7 +62,7 @@ var (
 	StderrPrefix string
 	Jobs         sync.WaitGroup
 
-	flagTrace        = flag.Bool("x", false, fmt.Sprintf("trace current target (sh -x) (set %s=1 for others too)", EnvTrace))
+	flagTrace        = flag.Bool("x", false, fmt.Sprintf("trace current target (sh -x) (set %s=1 for all others)", 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))
 )
@@ -102,16 +101,6 @@ func mkdirs(pth string) error {
 	return os.MkdirAll(pth, os.FileMode(0777))
 }
 
-func tempsuffix() string {
-	return strconv.FormatInt((time.Now().UnixNano()+int64(os.Getpid()))&0xFFFFFFFF, 16)
-}
-
-func tempfile(dir, prefix string) (*os.File, error) {
-	// It respects umask, unlike ioutil.TempFile
-	name := path.Join(dir, TmpPrefix+prefix+"."+tempsuffix())
-	return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, os.FileMode(0666))
-}
-
 func isModified(cwd, redoDir, tgt string) (bool, string, error) {
 	fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
 	if err != nil {
@@ -275,10 +264,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		cleanup()
 		return TgtErr{tgtOrig, errors.New("no .do found")}
 	}
-	if err = writeDep(fdDep, cwd, doFile); err != nil {
-		cleanup()
-		return TgtErr{tgtOrig, err}
-	}
 
 	// Determine basename and DIRPREFIX
 	ents := strings.Split(cwd, "/")
@@ -289,52 +274,32 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		cwd = path.Join(cwd, "..")
 	}
 	cwd = path.Clean(cwd)
+	doFilePath := path.Join(cwd, doFile)
 	basename := tgt
 	runErr := RunErr{Tgt: tgtOrig}
 	if strings.HasPrefix(doFile, "default.") {
 		basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
 		runErr.DoFile = doFile
 	}
+
+	if err = writeDep(fdDep, cwd, doFile); err != nil {
+		cleanup()
+		return TgtErr{tgtOrig, err}
+	}
 	trace(CWait, "%s", runErr.Name())
-	doFile = path.Base(doFile)
 
 	// Prepare command line
 	var cmdName string
 	var args []string
-	if err = unix.Access(path.Join(cwd, doFile), unix.X_OK); err == nil {
-		// Ordinary executable file
-		cmdName = doFile
+	if err = unix.Access(doFilePath, unix.X_OK); err == nil {
+		cmdName = doFilePath
 		args = make([]string, 0, 3)
 	} else {
-		fd, err := os.Open(path.Join(cwd, doFile))
-		if err != nil {
-			cleanup()
-			return TgtErr{tgtOrig, err}
-		}
-		buf := make([]byte, 512)
-		n, err := fd.Read(buf)
-		if err != nil {
-			cleanup()
-			return TgtErr{tgtOrig, err}
-		}
-		if n > 3 && string(buf[:3]) == "#!/" {
-			// Shebanged
-			t := string(buf[2:n])
-			nlIdx := strings.Index(t, "\n")
-			if nlIdx == -1 {
-				cleanup()
-				return TgtErr{tgtOrig, errors.New("not fully read shebang")}
-			}
-			args = strings.Split(t[:nlIdx], " ")
-			cmdName, args = args[0], args[1:]
+		cmdName = "/bin/sh"
+		if traced {
+			args = append(args, "-ex")
 		} else {
-			// Shell
-			cmdName = "/bin/sh"
-			if traced {
-				args = append(args, "-ex")
-			} else {
-				args = append(args, "-e")
-			}
+			args = append(args, "-e")
 		}
 		args = append(args, doFile)
 	}