env: remove OLLIE mount point variable from managed vars and defaults

This commit is contained in:
Ollie Agent 2026-07-31 08:02:17 +02:00
parent cb98439339
commit e968f5407e
3 changed files with 5 additions and 10 deletions

View File

@ -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() {

2
env/env.go vendored
View File

@ -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"),

8
env/env_test.go vendored
View File

@ -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)
}
}