CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix: update nodejs detection in mobile commands

* changefile
This commit is contained in:
Amr Bashir
2023-03-16 12:53:12 +02:00
committed by GitHub
parent 2b22f64972
commit 58d4709f7e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/cli-nodejs-detection.md Normal file
View File

@@ -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`

2
tooling/cli/src/mobile/init.rs
View File

@@ -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();