Added / stole some code to handle cmd execs better

It'll now use any custom environment path to lookup executables to run
as part of the project scripts
This commit is contained in:
Tim Shannon 2016-04-22 21:25:33 +00:00
parent 0cabc10fd7
commit 01f655a2a1
2 changed files with 63 additions and 5 deletions

View File

@ -1,5 +1,3 @@
#!/bin/bash #!/bin/bash
echo $PATH
go-bindata web/... && go build -a -v -o ironsmith go-bindata web/... && go build -a -v -o ironsmith

66
exec.go
View File

@ -6,7 +6,9 @@ package main
import ( import (
"fmt" "fmt"
"os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
) )
@ -23,10 +25,21 @@ func runCmd(cmd, dir string, env []string) ([]byte, error) {
args = s[1:] args = s[1:]
} }
ec := exec.Command(s[0], args...) name := s[0]
ec := &exec.Cmd{
Path: name,
Args: append([]string{name}, args...),
Dir: dir,
Env: env,
}
ec.Dir = dir if filepath.Base(name) == name {
ec.Env = env lp, err := lookPath(name, env)
if err != nil {
return nil, err
}
ec.Path = lp
}
vlog("Executing command: %s in dir %s\n", cmd, dir) vlog("Executing command: %s in dir %s\n", cmd, dir)
@ -36,3 +49,50 @@ func runCmd(cmd, dir string, env []string) ([]byte, error) {
} }
return result, nil return result, nil
} }
// similar to os/exec.LookPath, except it checks if the passed in
// custom environment includes a path definitions and uses that path instead
// note this probably only works on unix, that's all I care about for now
func lookPath(file string, env []string) (string, error) {
if strings.Contains(file, "/") {
err := findExecutable(file)
if err == nil {
return file, nil
}
return "", &exec.Error{file, err}
}
for i := range env {
if strings.HasPrefix(env[i], "PATH=") {
pathenv := env[i][5:]
if pathenv == "" {
return "", &exec.Error{file, exec.ErrNotFound}
}
for _, dir := range strings.Split(pathenv, ":") {
if dir == "" {
// Unix shell semantics: path element "" means "."
dir = "."
}
path := dir + "/" + file
if err := findExecutable(path); err == nil {
return path, nil
}
}
return "", &exec.Error{file, exec.ErrNotFound}
}
}
return exec.LookPath(file)
}
func findExecutable(file string) error {
d, err := os.Stat(file)
if err != nil {
return err
}
if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
return nil
}
return os.ErrPermission
}