diff --git a/cmd/Ollie/main.go b/cmd/Ollie/main.go index 9fc9eed..eff7536 100644 --- a/cmd/Ollie/main.go +++ b/cmd/Ollie/main.go @@ -16,10 +16,7 @@ import ( var ollie string func init() { - ollie = os.Getenv("OLLIE") - if ollie == "" { - ollie = filepath.Join(os.Getenv("HOME"), "mnt", "ollie") - } + ollie = filepath.Join(os.Getenv("HOME"), "mnt", "ollie") } func main() { diff --git a/env/env.go b/env/env.go index c2f3081..903631b 100644 --- a/env/env.go +++ b/env/env.go @@ -15,7 +15,6 @@ import ( // managed is the ordered list of env vars that ollie exposes to frontends. var managed = []string{ - "OLLIE", "OLLIE_CFG_PATH", "OLLIE_TOOLS_PATH", "OLLIE_AGENTS_PATH", @@ -39,7 +38,6 @@ func EnsureDefaults() { xdgRuntime = fmt.Sprintf("/run/user/%d", os.Getuid()) } defaults := map[string]string{ - "OLLIE": filepath.Join(home, "mnt", "ollie"), "OLLIE_CFG_PATH": filepath.Join(home, ".config", "ollie"), "OLLIE_TOOLS_PATH": filepath.Join(home, ".config", "ollie", "tools"), "OLLIE_AGENTS_PATH": filepath.Join(home, ".config", "ollie", "agents"), diff --git a/env/env_test.go b/env/env_test.go index 75a1fda..8ef0c8e 100644 --- a/env/env_test.go +++ b/env/env_test.go @@ -13,7 +13,7 @@ func TestEnsureDefaults(t *testing.T) { os.Unsetenv(k) } EnsureDefaults() - for _, k := range []string{"OLLIE", "OLLIE_TOOLS_PATH", "OLLIE_AGENTS_PATH", "OLLIE_SKILLS_PATH", "OLLIE_PROMPTS_PATH", "OLLIE_MEMORY_PATH", "OLLIE_TMP_PATH", "OLLIE_TRANSCRIPT_PATH"} { + for _, k := range []string{"OLLIE_TOOLS_PATH", "OLLIE_AGENTS_PATH", "OLLIE_SKILLS_PATH", "OLLIE_PROMPTS_PATH", "OLLIE_MEMORY_PATH", "OLLIE_TMP_PATH", "OLLIE_TRANSCRIPT_PATH"} { if v := os.Getenv(k); v == "" { t.Errorf("%s not set after EnsureDefaults", k) } @@ -21,10 +21,10 @@ func TestEnsureDefaults(t *testing.T) { } func TestEnsureDefaultsNoOverwrite(t *testing.T) { - t.Setenv("OLLIE", "/custom") + t.Setenv("OLLIE_CFG_PATH", "/custom") EnsureDefaults() - if v := os.Getenv("OLLIE"); v != "/custom" { - t.Errorf("OLLIE = %q, want /custom (should not overwrite)", v) + if v := os.Getenv("OLLIE_CFG_PATH"); v != "/custom" { + t.Errorf("OLLIE_CFG_PATH = %q, want /custom (should not overwrite)", v) } }