node/nvm-windows
1
0
Fork 0
mirror of https://github.com/coreybutler/nvm-windows.git synced 2026-01-15 03:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218 from bblanchon/fix-swap-32-64

Browse Source 
Fix "nvm use" swapping node32 and node64 even when not need (issue #134)
This commit is contained in:
Corey Butler
2016-10-27 10:27:48 -05:00
committed by GitHub
parent d85935f2e1 902c41c6e0
commit fd7f7baf73
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvm.go
View File

@@ -359,21 +359,23 @@ func use(version string, cpuarch string) {
// Use the assigned CPU architecture
cpuarch = arch.Validate(cpuarch)
e32 := file.Exists(env.root+"\\v"+version+"\\node32.exe")
e64 := file.Exists(env.root+"\\v"+version+"\\node64.exe")
used := file.Exists(env.root+"\\v"+version+"\\node.exe")
if (e32 || e64) {
if used {
if e32 {
os.Rename(env.root+"\\v"+version+"\\node.exe",env.root+"\\v"+version+"\\node64.exe")
os.Rename(env.root+"\\v"+version+"\\node32.exe",env.root+"\\v"+version+"\\node.exe")
} else {
os.Rename(env.root+"\\v"+version+"\\node.exe",env.root+"\\v"+version+"\\node32.exe")
os.Rename(env.root+"\\v"+version+"\\node64.exe",env.root+"\\v"+version+"\\node.exe")
}
} else if e32 || e64 {
os.Rename(env.root+"\\v"+version+"\\node"+cpuarch+".exe",env.root+"\\v"+version+"\\node.exe")
nodepath := env.root+"\\v"+version+"\\node.exe"
node32path := env.root+"\\v"+version+"\\node32.exe"
node64path := env.root+"\\v"+version+"\\node64.exe"
node32exists := file.Exists(node32path)
node64exists := file.Exists(node64path)
nodeexists := file.Exists(nodepath)
if node32exists && cpuarch == "32" { // user wants 32, but node.exe is 64
if nodeexists {
os.Rename(nodepath, node64path) // node.exe -> node64.exe
}
os.Rename(node32path, nodepath) // node32.exe -> node.exe
}
if node64exists && cpuarch == "64" { // user wants 64, but node.exe is 32
if nodeexists {
os.Rename(nodepath, node32path) // node.exe -> node32.exe
}
os.Rename(node64path, nodepath) // node64.exe -> node.exe
}
fmt.Println("Now using node v"+version+" ("+cpuarch+"-bit)")
}