platform specific shell usage

This commit is contained in:
Jesse Duffield 2018-08-07 15:21:50 +10:00
parent 46fb4c5f0a
commit a70753364c

View file

@ -7,6 +7,7 @@ import (
"fmt"
"os"
"os/exec"
"runtime"
"strings"
"time"
@ -111,12 +112,20 @@ func mergeGitStatusFiles(oldGitFiles, newGitFiles []GitFile) []GitFile {
return result
}
func platformShell() (string, string) {
if runtime.GOOS == "windows" {
return "cmd", "/c"
}
return "sh", "-c"
}
func runDirectCommand(command string) (string, error) {
timeStart := time.Now()
commandLog(command)
shell, shellArg := platformShell()
cmdOut, err := exec.
Command("sh", "-c", command).
Command(shell, shellArg, command).
CombinedOutput()
devLog("run direct command time for command: ", command, time.Now().Sub(timeStart))
return sanitisedCommandOutput(cmdOut, err)