fix: use dir over full path for coder bin (coder#1795)

f0ssel · web-flow · commit 781f3d064113 · 2022-05-26T19:05:46.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -359,7 +359,7 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
 	if err != nil {
 		return nil, xerrors.Errorf("getting os executable: %w", err)
 	}
-	cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, executablePath))
+	cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, filepath.Dir(executablePath)))
 	// Git on Windows resolves with UNIX-style paths.
 	// If using backslashes, it's unable to find the executable.
 	unixExecutablePath := strings.ReplaceAll(executablePath, "\\", "/")
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -80,7 +80,7 @@ func TestAgent(t *testing.T) {
 		ex, err := os.Executable()
 		t.Log(ex)
 		require.NoError(t, err)
-		require.True(t, strings.Contains(strings.TrimSpace(string(output)), ex), string(output), ex)
+		require.True(t, strings.Contains(strings.TrimSpace(string(output)), filepath.Dir(ex)))
 	})
 
 	t.Run("SessionTTY", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri`
`359`	`359`	`if err != nil {`
`360`	`360`	`return nil, xerrors.Errorf("getting os executable: %w", err)`
`361`	`361`	`}`
`362`		- cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, executablePath))
	`362`	+ cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, filepath.Dir(executablePath)))
`363`	`363`	`// Git on Windows resolves with UNIX-style paths.`
`364`	`364`	`// If using backslashes, it's unable to find the executable.`
`365`	`365`	`unixExecutablePath := strings.ReplaceAll(executablePath, "\\", "/")`