Try -c all around

ammario · ammario · commit b001437e31f8 · 2023-04-22T21:42:49.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
-	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -206,7 +205,9 @@ func (a *agent) runLoop(ctx context.Context) {
 	}
 }
 
-var isPowershellRe = regexp.MustCompile(`^(powershell|pwsh)(\.exe)?$`)
+var (
+	isCmdExeRe = regexp.MustCompile(`^(cmd|cmd\.exe)$`)
+)
 
 func createMetadataCommand(ctx context.Context, script string) (*exec.Cmd, error) {
 	// This is largely copied from agentssh, but for some reason the command
@@ -225,18 +226,14 @@ func createMetadataCommand(ctx context.Context, script string) (*exec.Cmd, error
 	if err != nil {
 		return nil, xerrors.Errorf("get user shell: %w", err)
 	}
+	shellBase := filepath.Base(shell)
 
 	var args []string
 	switch {
-	case runtime.GOOS == "windows":
-		if isPowershellRe.MatchString(filepath.Base(shell)) {
-			args = append(args, "-NoProfile", "-NonInteractive", "-Command")
-		} else {
-			// Probably cmd.exe
-			args = append(args, "/c")
-		}
-
+	case isCmdExeRe.MatchString(shellBase):
+		args = append(args, "/c")
 	default:
+		// -c works for powershell and sh variants.
 		args = append(args, "-c")
 	}
 	args = append(args, script)
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -1029,7 +1029,7 @@ func TestAgent_Metadata(t *testing.T) {
 
 		collectedAt1 := gotMd["greeting"].CollectedAt
 		if !assert.Equal(t, "hello", strings.TrimSpace(gotMd["greeting"].Value)) {
-			t.Logf("got: %+v", gotMd)
+			t.Errorf("got: %+v", gotMd)
 		}
 
 		if !assert.Eventually(t, func() bool {

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@ func TestAgent_Metadata(t *testing.T) {`
`1029`	`1029`
`1030`	`1030`	`collectedAt1 := gotMd["greeting"].CollectedAt`
`1031`	`1031`	`if !assert.Equal(t, "hello", strings.TrimSpace(gotMd["greeting"].Value)) {`
`1032`		`- t.Logf("got: %+v", gotMd)`
	`1032`	`+ t.Errorf("got: %+v", gotMd)`
`1033`	`1033`	`}`
`1034`	`1034`
`1035`	`1035`	`if !assert.Eventually(t, func() bool {`