From d249557a9129c4c5d09377ff14b7d62526a51599 Mon Sep 17 00:00:00 2001 From: coreybutler <770982+coreybutler@users.noreply.github.com> Date: Fri, 30 Oct 2026 13:08:33 -0500 Subject: [PATCH] fix: keep DataRoot under LocalAppData program home Custom InstallRoot like D:\nvm made DataRoot=parent(InstallRoot)=D:\, so .shim/.nodejs spilled onto the drive root. DataRoot is always %LOCALAPPDATA%\Author Software\nvm (or programRootOverride in tests). Signed-off-by: Corey Butler <770982+coreybutler@users.noreply.github.com> --- src/bootstrap/paths.go | 15 ++++++++++----- src/bootstrap/paths_test.go | 29 ++++++++++++++++++++++------- src/cmd/main.go | 6 +++++- src/test/clitest/sandbox.go | 12 ++++++++---- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/bootstrap/paths.go b/src/bootstrap/paths.go index 4b8a2ae..a91adad 100644 --- a/src/bootstrap/paths.go +++ b/src/bootstrap/paths.go @@ -41,13 +41,18 @@ func InstallRoot() (string, error) { return filepath.Clean(installRoot), nil } +// DataRoot is the per-user NVM home for runtime dirs (.shim, .nodejs, .sync, …). +// It is always under %LOCALAPPDATA%\Author Software\nvm (or ProgramRoot when that +// is unavailable) — never parent(InstallRoot). Custom InstallRoot may live on +// another drive; deriving DataRoot from it spilled runtime dirs onto drive roots. func DataRoot() (string, error) { - installRoot, err := InstallRoot() - if err != nil { - return "", err + if programRootOverride != "" { + return filepath.Clean(programRootOverride), nil } - - return filepath.Dir(installRoot), nil + if root, ok := canonicalUserDataRootFrom(os.LookupEnv); ok { + return filepath.Clean(root), nil + } + return ProgramRoot() } func CacheRoot() (string, error) { diff --git a/src/bootstrap/paths_test.go b/src/bootstrap/paths_test.go index e5e331a..9d914f2 100644 --- a/src/bootstrap/paths_test.go +++ b/src/bootstrap/paths_test.go @@ -6,11 +6,17 @@ import ( "testing" ) -func TestDataRootDerivedFromInstallRoot(t *testing.T) { - root := t.TempDir() +func TestDataRootUsesLocalAppDataNotInstallParent(t *testing.T) { resetBootstrapState(t) - if err := settings.Put("root", filepath.Join(root, "installs")); err != nil { + local := t.TempDir() + t.Setenv("LOCALAPPDATA", local) + oldOverride := programRootOverride + programRootOverride = "" + t.Cleanup(func() { programRootOverride = oldOverride }) + + customInstall := filepath.Join(t.TempDir(), "D", "nvm") + if err := settings.Put("root", customInstall); err != nil { t.Fatalf("Put(root) error = %v", err) } @@ -19,8 +25,9 @@ func TestDataRootDerivedFromInstallRoot(t *testing.T) { t.Fatalf("DataRoot() error = %v", err) } - if got != root { - t.Fatalf("DataRoot() = %q, want %q", got, root) + want := filepath.Join(local, "Author Software", "nvm") + if got != want { + t.Fatalf("DataRoot() = %q, want %q (must not be parent of InstallRoot)", got, want) } } @@ -28,7 +35,11 @@ func TestCacheRootDerivedFromDataRoot(t *testing.T) { root := t.TempDir() resetBootstrapState(t) - if err := settings.Put("root", filepath.Join(root, "installs")); err != nil { + oldOverride := programRootOverride + programRootOverride = root + t.Cleanup(func() { programRootOverride = oldOverride }) + + if err := settings.Put("root", filepath.Join(t.TempDir(), "custom-installs")); err != nil { t.Fatalf("Put(root) error = %v", err) } @@ -81,7 +92,11 @@ func TestDataSyncRootDerivedFromDataRoot(t *testing.T) { root := t.TempDir() resetBootstrapState(t) - if err := settings.Put("root", filepath.Join(root, "installs")); err != nil { + oldOverride := programRootOverride + programRootOverride = root + t.Cleanup(func() { programRootOverride = oldOverride }) + + if err := settings.Put("root", filepath.Join(t.TempDir(), "custom-installs")); err != nil { t.Fatalf("Put(root) error = %v", err) } diff --git a/src/cmd/main.go b/src/cmd/main.go index 2907ab1..45bd7c0 100644 --- a/src/cmd/main.go +++ b/src/cmd/main.go @@ -318,7 +318,11 @@ func main() { os.Exit(1) } } - dataRoot := filepath.Dir(installRoot) + dataRoot, dataErr := bootstrap.DataRoot() + if dataErr != nil { + fmt.Fprint(os.Stderr, dataErr.Error()) + os.Exit(1) + } _ = fs.RepairRuntimeACLs(installRoot, dataRoot) if fs.AllowsCrossUserWrite(installRoot) { fmt.Fprint(os.Stderr, "install root remains writable by other users\n") diff --git a/src/test/clitest/sandbox.go b/src/test/clitest/sandbox.go index 4f07053..6fb5267 100644 --- a/src/test/clitest/sandbox.go +++ b/src/test/clitest/sandbox.go @@ -25,17 +25,21 @@ func NewSandbox(t *testing.T) *Sandbox { t.Helper() tempRoot := t.TempDir() - installRoot := filepath.Join(tempRoot, "installs") + // Mirror production: DataRoot = %LOCALAPPDATA%\Author Software\nvm, InstallRoot = DataRoot\installs. + localAppData := filepath.Join(tempRoot, "Local") + dataRoot := filepath.Join(localAppData, "Author Software", "nvm") + installRoot := filepath.Join(dataRoot, "installs") if err := os.MkdirAll(installRoot, 0o755); err != nil { t.Fatalf("MkdirAll(installRoot) error = %v", err) } + t.Setenv("LOCALAPPDATA", localAppData) safeName := sanitizeTestName(t.Name()) registryKey := fmt.Sprintf("HKCU/Software/NVMTest/clitest_%s", safeName) s := &Sandbox{ t: t, - TempRoot: tempRoot, + TempRoot: dataRoot, InstallRoot: installRoot, RegistryKey: registryKey, } @@ -70,9 +74,9 @@ func (s *Sandbox) Cleanup() { s.deleteRegistryKey() } -// DataRoot returns the parent directory of InstallRoot. +// DataRoot returns the per-user NVM home (parent of InstallRoot in the default layout). func (s *Sandbox) DataRoot() string { - return filepath.Dir(s.InstallRoot) + return s.TempRoot } // WriteSetting persists a configuration value in the sandbox registry.