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
15 changes: 10 additions & 5 deletions src/bootstrap/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
29 changes: 22 additions & 7 deletions src/bootstrap/paths_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand All @@ -19,16 +25,21 @@ 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)
}
}

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

Expand Down Expand Up @@ -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)
}

Expand Down
6 changes: 5 additions & 1 deletion src/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 8 additions & 4 deletions src/test/clitest/sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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.
Expand Down
Loading