调整格式

exec/shell.go

@@ -20,7 +20,7 @@ import (
 // return：exit code
 func RunShellCommand(command string, environment map[string]string, workingDirectory string, outputCmd bool) (int, []string) {
 	receiveOutput := make(chan string, 1000)
-	result := RunShellContext(context.Background(), command, receiveOutput, environment, workingDirectory, outputCmd)
+	result := runCmdContext(context.Background(), "bash", []string{"-c", command}, receiveOutput, environment, workingDirectory, outputCmd)
 	return result, collections.NewListFromChan(receiveOutput).ToArray()
 }
 
@@ -31,7 +31,7 @@ func RunShellCommand(command string, environment map[string]string, workingDirec
 // workingDirectory：当前工作目录位置
 // return：exit code
 func RunShell(command string, receiveOutput chan string, environment map[string]string, workingDirectory string, outputCmd bool) int {
-	return RunShellContext(context.Background(), command, receiveOutput, environment, workingDirectory, outputCmd)
+	return runCmdContext(context.Background(), "bash", []string{"-c", command}, receiveOutput, environment, workingDirectory, outputCmd)
 }
 
 // RunShellContext 执行shell命令
@@ -41,10 +41,20 @@ func RunShell(command string, receiveOutput chan string, environment map[string]
 // workingDirectory：当前工作目录位置
 // return：exit code
 func RunShellContext(ctx context.Context, command string, receiveOutput chan string, environment map[string]string, workingDirectory string, outputCmd bool) int {
+	return runCmdContext(ctx, "bash", []string{"-c", command}, receiveOutput, environment, workingDirectory, outputCmd)
+}
+
+// RunShellContext 执行shell命令
+// command：要执行的命令
+// receiveOutput：输出流
+// environment：环境变量
+// workingDirectory：当前工作目录位置
+// return：exit code
+func runCmdContext(ctx context.Context, command string, args []string, receiveOutput chan string, environment map[string]string, workingDirectory string, outputCmd bool) int {
 	if outputCmd {
 		receiveOutput <- command
 	}
-	cmd := exec.CommandContext(ctx, "bash", "-c", command)
+	cmd := exec.CommandContext(ctx, command, args...)
 	cmd.Dir = workingDirectory
 	// 如果设置了环境变量，则追回进来
 	if environment != nil {