cmd: remove quotes for command arguments (#630)

Author: djshow832

pkg/manager/vip/network_test.go

@@ -42,6 +42,10 @@ func TestAddDelIP(t *testing.T) {
 		},
 	}
 
+	isOtherErr := func(err error) bool {
+		return strings.Contains(err.Error(), "command not found") || strings.Contains(err.Error(), "not in the sudoers file")
+	}
+
 	for i, test := range tests {
 		operation, err := NewNetworkOperation(test.virtualIP, test.link)
 		if test.initErr != "" {
@@ -54,7 +58,7 @@ func TestAddDelIP(t *testing.T) {
 
 		err = operation.AddIP()
 		// Maybe the command is not installed.
-		if err != nil && strings.Contains(err.Error(), "command not found") {
+		if err != nil && isOtherErr(err) {
 			continue
 		}
 		if test.addErr != "" {
@@ -65,7 +69,7 @@ func TestAddDelIP(t *testing.T) {
 		}
 
 		err = operation.SendARP()
-		if err == nil || !strings.Contains(err.Error(), "command not found") {
+		if err == nil || !isOtherErr(err) {
 			if test.sendErr != "" {
 				require.Error(t, err, "case %d", i)
 				require.Contains(t, err.Error(), test.sendErr, "case %d", i)

pkg/util/cmd/cmd.go

@@ -4,7 +4,6 @@
 package cmd
 
 import (
-	"fmt"
 	"os/exec"
 	"strings"
 
@@ -22,7 +21,7 @@ func ExecCmd(cmd string, args ...string) error {
 		if !isValidArg(arg) {
 			return errors.Errorf("invalid argument: %s", arg)
 		}
-		cmds = append(cmds, escapeArg(arg))
+		cmds = append(cmds, arg)
 	}
 	output, err := exec.Command(cmds[0], cmds[1:]...).CombinedOutput()
 	if err != nil {
@@ -40,7 +39,3 @@ func isValidArg(arg string) bool {
 	}
 	return true
 }
-
-func escapeArg(arg string) string {
-	return fmt.Sprintf("'%s'", strings.ReplaceAll(arg, "'", "'\\''"))
-}

pkg/util/cmd/cmd_test.go

@@ -21,6 +21,9 @@ func TestExecCmd(t *testing.T) {
 		{
 			cmds: []string{"echo", "abc"},
 		},
+		{
+			cmds: []string{"cd", "."},
+		},
 		{
 			cmds:   []string{"hello"},
 			hasErr: true,