vyla-entertainment/Home
2
0
Fork 0
mirror of https://gitlab.com/vyla-entertainment/home.git synced 2026-11-13 21:57:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

add macOS Node runtime and appdata support

Browse Source
This commit is contained in:
alwaysmesmerizingyou
2026-09-04 20:08:27 -07:00
parent ec50c4e07f
commit ddf3abb314
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src-tauri/src/main.rs
View File

@@ -60,9 +60,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(resource_dir) = app.path().resource_dir() {
let candidates = [
resource_dir.join("bin").join("node.exe"),
resource_dir.join("bin").join("node"),
resource_dir.join("node.exe"),
resource_dir.join("node"),
resource_dir.join("_up_").join("bin").join("node.exe"),
resource_dir.join("_up_").join("bin").join("node"),
resource_dir.join("_up_").join("node.exe"),
resource_dir.join("_up_").join("node"),
];
for candidate in candidates {
if candidate.exists() {
@@ -75,9 +79,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Some(parent) = exe_path.parent() {
let candidates = [
parent.join("bin").join("node.exe"),
parent.join("bin").join("node"),
parent.join("node.exe"),
parent.join("node"),
parent.join("resources").join("bin").join("node.exe"),
parent.join("resources").join("bin").join("node"),
parent.join("resources").join("node.exe"),
parent.join("resources").join("node"),
];
for candidate in candidates {
if candidate.exists() {
@@ -89,9 +97,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(path_var) = std::env::var("PATH") {
for p in std::env::split_paths(&path_var) {
let candidate = p.join("node.exe");
if candidate.exists() {
return Some(clean_path(&candidate));
let node_exe = p.join("node.exe");
if node_exe.exists() {
return Some(clean_path(&node_exe));
}
let node = p.join("node");
if node.exists() {
return Some(clean_path(&node));
}
}
}
@@ -120,6 +132,22 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
}
}
#[cfg(not(windows))]
{
let default_paths = [
"/usr/local/bin/node",
"/usr/bin/node",
"/opt/homebrew/bin/node",
"/opt/local/bin/node",
];
for path in default_paths {
let candidate = std::path::Path::new(path);
if candidate.exists() {
return Some(clean_path(candidate));
}
}
}
None
}
@@ -622,10 +650,12 @@ fn main() {
}
};
let vyla_files_str = clean_path(&vyla_files);
let mut cmd = Command::new(&node_bin);
cmd.arg(&main_js)
.current_dir(&root_dir)
.env("APPDATA_PATH", &app_data_str)
.env("APPDATA_PATH", &vyla_files_str)
.env("NODE_EXE", &node_bin)
.stdin(Stdio::piped())
.stdout(Stdio::piped())