From 3626b7a92be2890a82e8d5bd00d13887e199ea4a Mon Sep 17 00:00:00 2001 From: ninjadev64 <63245705+ninjadev64@users.noreply.github.com> Date: Sun, 9 Mar 2025 15:19:18 +0000 Subject: [PATCH] fix(bundler): bundle resources to correct path during RPM bundling when resources are specified as a map (#12759) Co-authored-by: Fabian-Lars --- .changes/fix-incorrect-rpm-resource-paths.md | 5 +++++ crates/tauri-bundler/src/bundle/linux/rpm.rs | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changes/fix-incorrect-rpm-resource-paths.md diff --git a/.changes/fix-incorrect-rpm-resource-paths.md b/.changes/fix-incorrect-rpm-resource-paths.md new file mode 100644 index 000000000..6b75972e8 --- /dev/null +++ b/.changes/fix-incorrect-rpm-resource-paths.md @@ -0,0 +1,5 @@ +--- +'tauri-bundler': 'patch:bug' +--- + +Fix resources being bundled to the wrong path during RPM bundling when resources are specified as a map. diff --git a/crates/tauri-bundler/src/bundle/linux/rpm.rs b/crates/tauri-bundler/src/bundle/linux/rpm.rs index f0e0f4893..b7935b36e 100644 --- a/crates/tauri-bundler/src/bundle/linux/rpm.rs +++ b/crates/tauri-bundler/src/bundle/linux/rpm.rs @@ -186,10 +186,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { FileOptions::new(resource_dir.to_string_lossy()).mode(FileMode::Dir { permissions: 0o755 }), )?; // Then add the resources files in that directory - for src in settings.resource_files() { - let src = src?; - let dest = resource_dir.join(tauri_utils::resources::resource_relpath(&src)); - builder = builder.with_file(&src, FileOptions::new(dest.to_string_lossy()))?; + for resource in settings.resource_files().iter() { + let resource = resource?; + let dest = resource_dir.join(resource.target()); + builder = builder.with_file(resource.path(), FileOptions::new(dest.to_string_lossy()))?; } }