Skip to content

Commit

Permalink
Uses correct path when moving npm from temp folder to node_modules + …
Browse files Browse the repository at this point in the history
…error handling
  • Loading branch information
isakvik committed Feb 1, 2019
1 parent 21f36f2 commit 42fd4a6
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/nvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,17 +292,20 @@ func install(version string, cpuarch string) {
// sometimes Windows can take some time to enable access to large amounts of files after unzip, use exponential backoff to wait until it is ready
for _, i := range [5]int{1, 2, 4, 8, 16} {
time.Sleep(time.Duration(i)*time.Second)
moveNpmErr = os.Rename(filepath.Join(tempDir, "nvm-npm", "npm-"+npmv), filepath.Join(env.root, "v"+version, "node_modules", "npm"))
moveNpmErr = os.Rename(npmSourcePath, filepath.Join(env.root, "v"+version, "node_modules", "npm"))
if moveNpmErr == nil { break }
}

}

if err == nil {
if err == nil && moveNpmErr == nil {
// Remove the temp directory
// may consider keep the temp files here
os.RemoveAll(tempDir)

fmt.Println("\n\nInstallation complete. If you want to use this version, type\n\nnvm use "+version)
} else if moveNpmErr != nil {
fmt.Println("Error: Unable to move directory "+npmSourcePath+" to node_modules: "+moveNpmErr.Error())
} else {
fmt.Println("Error: Unable to install NPM: "+err.Error());
}
Expand Down

0 comments on commit 42fd4a6

Please sign in to comment.