Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/tool/command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ func (svc *Service) internalCommandEnv(extra map[string]string) ([]string, error

func (svc *Service) baseCommandEnv() (map[string]string, error) {
env := map[string]string{}
for _, key := range []string{"PATH", "LANG", "LC_ALL", "SSL_CERT_FILE", "SSL_CERT_DIR", "SYSTEMROOT", "WINDIR", "COMSPEC", "PATHEXT", "TEMP", "TMP", "WSLENV"} {
for _, key := range []string{"PATH", "LANG", "LC_ALL", "SSL_CERT_FILE", "SSL_CERT_DIR", "SYSTEMROOT", "WINDIR", "COMSPEC", "PATHEXT", "TEMP", "TMP", "WSLENV", "PROGRAMFILES", "PROGRAMW6432"} {
if value := os.Getenv(key); value != "" {
env[key] = value
}
Expand Down
47 changes: 47 additions & 0 deletions internal/tool/command/command_env_windows_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//go:build windows

package command

import (
"strings"
"testing"

"github.com/uvwt/agentdock/internal/config"
"github.com/uvwt/agentdock/internal/envstore"
)

func TestCommandEnvPreservesWindowsProgramFilesVariables(t *testing.T) {
home := t.TempDir()
envs, err := envstore.New(home)
if err != nil {
t.Fatal(err)
}
svc := New(
func() config.Config { return config.Config{AgentDockHome: home, AgentDockDefaultDir: home} },
nil,
envs,
NewSessionStore(),
nil,
nil,
nil,
)

t.Setenv("PROGRAMFILES", `C:\Program Files`)
t.Setenv("PROGRAMW6432", `C:\Program Files`)
got, err := svc.CommandEnv("", nil)
if err != nil {
t.Fatal(err)
}
values := map[string]string{}
for _, entry := range got {
key, value, ok := strings.Cut(entry, "=")
if ok {
values[key] = value
}
}
for _, key := range []string{"PROGRAMFILES", "PROGRAMW6432"} {
if values[key] != `C:\Program Files` {
t.Fatalf("%s = %q, want %q", key, values[key], `C:\Program Files`)
}
}
}
Loading