p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Always use /bin/sh to run the command." am: 9e766acb09 am: 0188c32fb5 

Original change: https://android-review.googlesource.com/c/platform/build/+/1662423

Change-Id: I34b5400ffa66579ac8269e65b0ec84b82ba357d5
This commit is contained in:
Treehugger Robot 2021-04-02 18:58:52 +00:00 committed by Automerger Merge Worker
parent 6751ce0f7c 0188c32fb5
commit 8f95f2354d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/rbcrun/host.go
View File

@ -182,7 +182,7 @@ func shell(_ *starlark.Thread, b *starlark.Builtin, args starlark.Tuple,
}
if shellPath == "" {
return starlark.None,
fmt.Errorf("cannot run shell, SHELL environment variable is not set (running on Windows?)")
fmt.Errorf("cannot run shell, /bin/sh is missing (running on Windows?)")
}
cmd := exec.Command(shellPath, "-c", command)
// We ignore command's status
@ -234,8 +234,12 @@ func setup(env []string) {
"rblf_wildcard": starlark.NewBuiltin("rblf_wildcard", wildcard),
}
// NOTE(asmundak): OS-specific.
shellPath, _ = os.LookupEnv("SHELL")
// NOTE(asmundak): OS-specific. Behave similar to Linux `system` call,
// which always uses /bin/sh to run the command
shellPath = "/bin/sh"
if _, err := os.Stat(shellPath); err != nil {
shellPath = ""
}
}
// Parses, resolves, and executes a Starlark file.