fix: update nodejs detection in mobile commands (#6451)

* fix: update nodejs detection in mobile commands * changefile
tauri-apps · Mar 16, 2023 · 58d4709 · 58d4709
1 parent 2b22f64
commit 58d4709
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/cli-nodejs-detection.md b/.changes/cli-nodejs-detection.md
@@ -0,0 +1,5 @@
+---
+'cli.rs': 'patch'
+---
+
+In mobile commands, correctly detect when nodejs binary has the version in its name, for example `node-18`
diff --git a/tooling/cli/src/mobile/init.rs b/tooling/cli/src/mobile/init.rs
@@ -120,7 +120,7 @@ pub fn exec(
 
   let binary_path = PathBuf::from(&binary);
   let bin_stem = binary_path.file_stem().unwrap().to_string_lossy();
-  let r = regex::Regex::new("(nodejs|node)([1-9]*)*$").unwrap();
+  let r = regex::Regex::new("(nodejs|node)\\-?([1-9]*)*$").unwrap();
   if r.is_match(&bin_stem) {
     if let Some(npm_execpath) = var_os("npm_execpath").map(PathBuf::from) {
       let manager_stem = npm_execpath.file_stem().unwrap().to_os_string();