|
|
@@ -9,6 +9,7 @@ import (
|
|
|
"bytes"
|
|
|
"context"
|
|
|
"os/exec"
|
|
|
+ "runtime"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
@@ -162,6 +163,14 @@ func stepLogFinish(req *ExecutionRequest) bool {
|
|
|
return true
|
|
|
}
|
|
|
|
|
|
+func wrapCommandInShell(ctx context.Context, finalParsedCommand string) *exec.Cmd {
|
|
|
+ if runtime.GOOS == "windows" {
|
|
|
+ return exec.CommandContext(ctx, "cmd", "/C", finalParsedCommand)
|
|
|
+ }
|
|
|
+
|
|
|
+ return exec.CommandContext(ctx, "sh", "-c", finalParsedCommand)
|
|
|
+}
|
|
|
+
|
|
|
func stepExec(req *ExecutionRequest) bool {
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.action.Timeout)*time.Second)
|
|
|
defer cancel()
|
|
|
@@ -169,7 +178,7 @@ func stepExec(req *ExecutionRequest) bool {
|
|
|
var stdout bytes.Buffer
|
|
|
var stderr bytes.Buffer
|
|
|
|
|
|
- cmd := exec.CommandContext(ctx, "sh", "-c", req.finalParsedCommand)
|
|
|
+ cmd := wrapCommandInShell(ctx, req.finalParsedCommand)
|
|
|
cmd.Stdout = &stdout
|
|
|
cmd.Stderr = &stderr
|
|
|
|