Skip to content

Commit 787ea09

Browse files
gimaitlucasfernog
andauthored
fix: generate windows resource directories using resource_relpath, closes #4087. (#4111)
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
1 parent 2b6c24d commit 787ea09

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.changes/fix-resource-windows.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri-bundler": patch
3+
---
4+
5+
Fixes resource bundling on Windows when the resource path includes root or parent directory components.

tooling/bundler/src/bundle/windows/msi/wix.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use log::info;
1414
use regex::Regex;
1515
use serde::{Deserialize, Serialize};
1616
use sha2::Digest;
17+
use tauri_utils::resources::resource_relpath;
1718
use std::{
1819
collections::{BTreeMap, HashMap},
1920
fs::{create_dir_all, read_to_string, remove_dir_all, rename, write, File},
@@ -796,13 +797,10 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
796797
};
797798

798799
// split the resource path directories
799-
let components_count = src.components().count();
800-
let directories = src
800+
let target_path = resource_relpath(&src);
801+
let components_count = target_path.components().count();
802+
let directories = target_path
801803
.components()
802-
.filter(|component| {
803-
let comp = component.as_os_str();
804-
comp != "." && comp != ".."
805-
})
806804
.take(components_count - 1) // the last component is the file
807805
.collect::<Vec<_>>();
808806

0 commit comments

Comments
 (0)