try lucky 1

Author: andrzej-janczak

config/node-utils.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"runtime"
 )
@@ -30,17 +29,28 @@ func getNodeFileName(nodeRuntime *Runtime) string {
 		nodeArch = goarch
 	}
 
-	return fmt.Sprintf("node-v%s-%s-%s", nodeRuntime.Version(), goos, nodeArch)
+	// Map Go OS to Node.js OS name
+	var nodeOS string
+	switch goos {
+	case "windows":
+		nodeOS = "win"
+	default:
+		nodeOS = goos
+	}
+
+	version := nodeRuntime.Version()
+
+	return filepath.Join("node-v" + version + "-" + nodeOS + "-" + nodeArch)
 }
 
 func genInfoNode(r *Runtime) map[string]string {
 	nodeFileName := getNodeFileName(r)
 
 	return map[string]string{
 		"nodeFileName": nodeFileName,
-		"installDir":   path.Join(Config.RuntimesDirectory(), nodeFileName),
-		"node":         path.Join(Config.RuntimesDirectory(), nodeFileName, "bin", "node"),
-		"npm":          path.Join(Config.RuntimesDirectory(), nodeFileName, "bin", "npm"),
+		"installDir":   filepath.Join(Config.RuntimesDirectory(), nodeFileName),
+		"node":         filepath.Join(Config.RuntimesDirectory(), nodeFileName, "bin", "node"),
+		"npm":          filepath.Join(Config.RuntimesDirectory(), nodeFileName, "bin", "npm"),
 	}
 }