diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-11-02 12:22:32 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-11-02 12:22:32 +0900 |
| commit | f33aea9ff9c5eb678c6f1de59132aab69a59757e (patch) | |
| tree | c59e2a93a3f8829146f18ad3079bc182f30d44c6 /internal/env | |
| parent | e7fc311d0b880e7ae44b97d406a309604b01dbac (diff) | |
internal/env: cleaner runtime dir fallback
This now places rundir inside the fallback runtime dir, so special case in internal/outcome is avoided.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/env')
| -rw-r--r-- | internal/env/env.go | 5 | ||||
| -rw-r--r-- | internal/env/env_test.go | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/internal/env/env.go b/internal/env/env.go index ebb816d6..cdacb203 100644 --- a/internal/env/env.go +++ b/internal/env/env.go @@ -29,12 +29,11 @@ func (env *Paths) Copy(v *hst.Paths, userid int) { if env.RuntimePath == nil { // fall back to path in share since hakurei has no hard XDG dependency - v.RunDirPath = v.SharePath.Append("run") - v.RuntimePath = v.RunDirPath.Append("compat") + v.RuntimePath = v.SharePath.Append("compat") } else { v.RuntimePath = env.RuntimePath - v.RunDirPath = env.RuntimePath.Append("hakurei") } + v.RunDirPath = v.RuntimePath.Append("hakurei") } // CopyPaths returns a populated [Paths]. diff --git a/internal/env/env_test.go b/internal/env/env_test.go index 8a07d6b5..77ece8d6 100644 --- a/internal/env/env_test.go +++ b/internal/env/env_test.go @@ -35,8 +35,8 @@ func TestPaths(t *testing.T) { }, hst.Paths{ TempDir: fhs.AbsTmp, SharePath: fhs.AbsTmp.Append("hakurei.3735928559"), - RuntimePath: fhs.AbsTmp.Append("hakurei.3735928559/run/compat"), - RunDirPath: fhs.AbsTmp.Append("hakurei.3735928559/run"), + RuntimePath: fhs.AbsTmp.Append("hakurei.3735928559/compat"), + RunDirPath: fhs.AbsTmp.Append("hakurei.3735928559/compat/hakurei"), }, ""}, {"full", &env.Paths{ |