Merge pull request #1210 from CyBot/master

coreybutler · web-flow · commit f538704ab58d · 2025-01-02T09:11:08.000-06:00
Don't perform any changes when trying to use current node version
diff --git a/src/nvm.go b/src/nvm.go
@@ -1154,6 +1154,14 @@ func use(version string, cpuarch string, reload ...bool) {
 			}
 		}
 
+		// Check if a change is needed
+		curVersion, curCpuarch := node.GetCurrentVersion()
+		if version == curVersion && cpuarch == curCpuarch {
+			fmt.Println("node v" + version + " (" + cpuarch + "-bit) is already in use.")
+			status <- Status{Done: true}
+			return
+		}
+
 		// Make sure the version is installed. If not, warn.
 		if !node.IsVersionInstalled(env.root, version, cpuarch) {
 			err = fmt.Errorf("node v%s (%v-bit) is not installed.", version, cpuarch)

Original file line number	Diff line number	Diff line change
`@@ -1154,6 +1154,14 @@ func use(version string, cpuarch string, reload ...bool) {`
`1154`	`1154`	`}`
`1155`	`1155`	`}`
`1156`	`1156`
	`1157`	`+ // Check if a change is needed`
	`1158`	`+ curVersion, curCpuarch := node.GetCurrentVersion()`
	`1159`	`+ if version == curVersion && cpuarch == curCpuarch {`
	`1160`	`+ fmt.Println("node v" + version + " (" + cpuarch + "-bit) is already in use.")`
	`1161`	`+ status <- Status{Done: true}`
	`1162`	`+ return`
	`1163`	`+ }`
	`1164`	`+`
`1157`	`1165`	`// Make sure the version is installed. If not, warn.`
`1158`	`1166`	`if !node.IsVersionInstalled(env.root, version, cpuarch) {`
`1159`	`1167`	`err = fmt.Errorf("node v%s (%v-bit) is not installed.", version, cpuarch)`