zhangdeman/command
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去除换行符

Browse Source
This commit is contained in:
白茶清欢 2023-04-09 23:00:31 +08:00
parent 55b64854b2
commit 4a2307ef45
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
execute.go
View File

@ -11,6 +11,7 @@ import (
"errors" "errors"
"os" "os"
"os/exec" "os/exec"
"strings"
"time" "time"
"git.zhangdeman.cn/zhangdeman/command/define" "git.zhangdeman.cn/zhangdeman/command/define"
@ -63,11 +64,7 @@ func Execute(workDir string, command string, param []string) *define.Result {
cmdInstance := exec.Command(command, param...) cmdInstance := exec.Command(command, param...)
cmdInstance.Dir = result.WorkDir cmdInstance.Dir = result.WorkDir
result.Output, result.Error = cmdInstance.CombinedOutput() result.Output, result.Error = cmdInstance.CombinedOutput()
if len(result.Output) >= 2 { result.Output = []byte(strings.Replace(string(result.Output), "\n", "", -1))
if string(result.Output[len(result.Output)-1]) == "n" && string(result.Output[len(result.Output)-2]) == "\\" {
result.Output = result.Output[0 : len(result.Output)-2]
}
}
return result return result
} }