From f70a6c9671b17ab03a6e6f87a7362f8076c8339d Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Fri, 16 Oct 2026 00:41:48 +0400 Subject: [PATCH] fix: rpm duplicate sidecar --- src-tauri/build.rs | 10 +++------- src-tauri/tauri.conf.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src-tauri/build.rs b/src-tauri/build.rs index f6b9c0b3..e80af3c1 100644 --- a/src-tauri/build.rs +++ b/src-tauri/build.rs @@ -100,19 +100,15 @@ fn external_binaries_exist() -> bool { let binaries_dir = PathBuf::from(&manifest_dir).join("binaries"); - // Check for all required external binaries (must match tauri.conf.json externalBin) - let donut_proxy_name = if target.contains("windows") { - format!("donut-proxy-{}.exe", target) - } else { - format!("donut-proxy-{}", target) - }; + // Must match tauri.conf.json externalBin. donut-proxy is a cargo bin of this + // crate, which the bundler packages on its own. let xray_name = if target.contains("windows") { format!("xray-{}.exe", target) } else { format!("xray-{}", target) }; - binaries_dir.join(&donut_proxy_name).exists() && binaries_dir.join(&xray_name).exists() + binaries_dir.join(&xray_name).exists() } fn ensure_dist_folder_exists() { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d855b097..46aab6e4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -30,7 +30,7 @@ "active": true, "targets": ["app", "dmg", "nsis", "deb", "rpm", "appimage"], "category": "Productivity", - "externalBin": ["binaries/donut-proxy", "binaries/xray"], + "externalBin": ["binaries/xray"], "resources": { "binaries/xray-LICENSE.txt": "licenses/Xray-core-LICENSE.txt" },