fix(cli.js): detect node-<version> binary, closes #6427 (#6432)

amrbashir · TurtleIdiot · web-flow · commit 1c8229fbe273 · 2023-03-16T09:01:41.000-03:00
* fix(cli.js): detect `node-<version>` binary, closes #6427 * use `?` instead of `*` and escape the hyphen Co-authored-by: TurtleIdiot <18502738+TurtleIdiot@users.noreply.github.com> --------- Co-authored-by: TurtleIdiot <18502738+TurtleIdiot@users.noreply.github.com>
diff --git a/.changes/clijs-node-version.md b/.changes/clijs-node-version.md
@@ -0,0 +1,5 @@
+---
+'cli.js': patch
+---
+
+Fix crash when nodejs binary has the version in its name, for example `node-18`
diff --git a/tooling/cli/node/tauri.js b/tooling/cli/node/tauri.js
@@ -20,7 +20,7 @@ if (bin === '@tauri-apps/cli') {
 }
 // Even if started by a package manager, the binary will be NodeJS.
 // Some distribution still use "nodejs" as the binary name.
-else if (binStem.match(/(nodejs|node)([1-9]*)*$/g)) {
+else if (binStem.match(/(nodejs|node)\-?([1-9]*)*$/g)) {
   const managerStem = process.env.npm_execpath
     ? path.parse(process.env.npm_execpath).name.toLowerCase()
     : null

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'cli.js': patch
 +---
++
 +Fix crash when nodejs binary has the version in its name, for example `node-18`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ if (bin === '@tauri-apps/cli') {`
`20`	`20`	`}`
`21`	`21`	`// Even if started by a package manager, the binary will be NodeJS.`
`22`	`22`	`// Some distribution still use "nodejs" as the binary name.`
`23`		`-else if (binStem.match(/(nodejs\|node)([1-9])$/g)) {`
	`23`	`+else if (binStem.match(/(nodejs\|node)\-?([1-9])$/g)) {`
`24`	`24`	`const managerStem = process.env.npm_execpath`
`25`	`25`	`? path.parse(process.env.npm_execpath).name.toLowerCase()`
`26`	`26`	`: null`