fix: Use current directory for Windows bundling tools (fix: 9895)

AnthonyNGarcia · May 30, 2024 · 27069a1 · 27069a1
1 parent 253595a
commit 27069a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tooling/bundler/src/bundle/windows/msi.rs b/tooling/bundler/src/bundle/windows/msi.rs
@@ -26,9 +26,8 @@ const WIX_REQUIRED_FILES: &[&str] = &[
 /// Runs all of the commands to build the MSI installer.
 /// Returns a vector of PathBuf that shows where the MSI was created.
 pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result<Vec<PathBuf>> {
-  let mut wix_path = dirs_next::cache_dir().unwrap();
-  wix_path.push("tauri/WixTools314");
-
+  let tauri_tools_path = std::env::current_dir().unwrap().join("target/tools");
+  let wix_path = tauri_tools_path.join("Wix");
   if !wix_path.exists() {
     wix::get_and_extract_wix(&wix_path)?;
   } else if WIX_REQUIRED_FILES

diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs
@@ -64,7 +64,7 @@ const NSIS_REQUIRED_FILES_HASH: &[(&str, &str, &str, HashAlgorithm)] = &[(
 /// Runs all of the commands to build the NSIS installer.
 /// Returns a vector of PathBuf that shows where the NSIS installer was created.
 pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result<Vec<PathBuf>> {
-  let tauri_tools_path = dirs_next::cache_dir().unwrap().join("tauri");
+  let tauri_tools_path = std::env::current_dir().unwrap().join("target/tools");
   let nsis_toolset_path = tauri_tools_path.join("NSIS");
 
   if !nsis_toolset_path.exists() {