|
@@ -1,7 +1,6 @@
|
|
|
package util
|
|
|
|
|
|
import (
|
|
|
- "fmt"
|
|
|
"os"
|
|
|
"os/exec"
|
|
|
"strconv"
|
|
@@ -42,28 +41,14 @@ func ExecuteWithDirAsync(dir string, name string, arg ...string) (*exec.Cmd, err
|
|
|
cmd := exec.Command(name, arg...)
|
|
|
// 指定目录
|
|
|
cmd.Dir = dir
|
|
|
- go func() {
|
|
|
- _, output, err := ExecuteWithDirSync(dir, name, arg...)
|
|
|
- if err != nil {
|
|
|
- fmt.Println("Error waiting for command,【output】=", output, ",【err】=", err)
|
|
|
- }
|
|
|
- }()
|
|
|
- return cmd, nil
|
|
|
+ err := cmd.Start()
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ } else {
|
|
|
+ return cmd, nil
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-//func ExecuteWithDirAsync(dir string, name string, arg ...string) (*exec.Cmd, error) {
|
|
|
-// // 创建一个Cmd对象,表示要执行的命令
|
|
|
-// cmd := exec.Command(name, arg...)
|
|
|
-// // 指定目录
|
|
|
-// cmd.Dir = dir
|
|
|
-// err := cmd.Start()
|
|
|
-// if err != nil {
|
|
|
-// return nil, err
|
|
|
-// } else {
|
|
|
-// return cmd, nil
|
|
|
-// }
|
|
|
-//}
|
|
|
-
|
|
|
func ExecuteWithDirSync(dir string, name string, arg ...string) (*exec.Cmd, string, error) {
|
|
|
cmd := exec.Command(name, arg...)
|
|
|
cmd.Dir = dir
|