git/lancet
1
0
Fork 0
mirror of https://github.com/duke-git/lancet.git synced 2026-02-18 11:42:26 +08:00
Code Issues Projects Releases Wiki Activity

feat: add option support for ExecCommand

Browse Source
This commit is contained in:
dudaodong
2023-04-19 14:25:31 +08:00
parent 4ba91d7e4c
commit 07f5e0697f
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/system.md
View File

@@ -207,14 +207,17 @@ func main() {
} }
``` ```
### <span id="ExecCommand">CompareOsEnv</span> ### <span id="ExecCommand">ExecCommand</span>
<p>use shell /bin/bash -c(linux) or cmd (windows) to execute command.</p> <p>use shell /bin/bash -c(linux) or cmd (windows) to execute command.</p>
<b>Signature:</b> <b>Signature:</b>
```go ```go
func ExecCommand(command string) (stdout, stderr string, err error) type (
Option func(*exec.Cmd)
)
func ExecCommand(command string, opts ...Option) (stdout, stderr string, err error)
``` ```
<b>Example:</b> <b>Example:</b>

7
docs/system_zh-CN.md
View File

@@ -207,14 +207,17 @@ func main() {
} }
``` ```
### <span id="ExecCommand">CompareOsEnv</span> ### <span id="ExecCommand">ExecCommand</span>
<p>使用shell /bin/bash -c(linux) 或 cmd (windows) 执行shell命令</p> <p>使用shell /bin/bash -c(linux) 或 cmd (windows) 执行shell命令</p>
<b>Signature:</b> <b>Signature:</b>
```go ```go
func ExecCommand(command string) (stdout, stderr string, err error) type (
Option func(*exec.Cmd)
)
func ExecCommand(command string, opts ...Option) (stdout, stderr string, err error)
``` ```
<b>Example:</b> <b>Example:</b>

13
system/os.go
View File

@@ -15,6 +15,10 @@ import (
"golang.org/x/text/encoding/simplifiedchinese" "golang.org/x/text/encoding/simplifiedchinese"
) )
type (
Option func(*exec.Cmd)
)
// IsWindows check if current os is windows // IsWindows check if current os is windows
func IsWindows() bool { func IsWindows() bool {
return runtime.GOOS == "windows" return runtime.GOOS == "windows"
@@ -58,7 +62,7 @@ func CompareOsEnv(key, comparedEnv string) bool {
// param `command` is a complete command string, like, ls -a (linux), dir(windows), ping 127.0.0.1 // param `command` is a complete command string, like, ls -a (linux), dir(windows), ping 127.0.0.1
// in linux, use /bin/bash -c to execute command // in linux, use /bin/bash -c to execute command
// in windows, use powershell.exe to execute command // in windows, use powershell.exe to execute command
func ExecCommand(command string) (stdout, stderr string, err error) { func ExecCommand(command string, opts ...Option) (stdout, stderr string, err error) {
var out bytes.Buffer var out bytes.Buffer
var errOut bytes.Buffer var errOut bytes.Buffer
@@ -66,6 +70,13 @@ func ExecCommand(command string) (stdout, stderr string, err error) {
if IsWindows() { if IsWindows() {
cmd = exec.Command("powershell.exe", command) cmd = exec.Command("powershell.exe", command)
} }
for _, opt := range opts {
if opt != nil {
opt(cmd)
}
}
cmd.Stdout = &out cmd.Stdout = &out
cmd.Stderr = &errOut cmd.Stderr = &errOut

2
system/os_test.go
View File

@@ -45,7 +45,7 @@ func TestExecCommand(t *testing.T) {
assert := internal.NewAssert(t, "TestExecCommand") assert := internal.NewAssert(t, "TestExecCommand")
// linux or mac // linux or mac
stdout, stderr, err := ExecCommand("ls") stdout, stderr, err := ExecCommand("ls", WithForeground())
t.Log("std out: ", stdout) t.Log("std out: ", stdout)
t.Log("std err: ", stderr) t.Log("std err: ", stderr)
assert.Equal("", stderr) assert.Equal("", stderr)