fix tests

tauri-apps · Aug 31, 2023 · d5a2882 · d5a2882
1 parent ab2fb0a
commit d5a2882
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/.changes/tauri-utils-current-exe.md b/.changes/tauri-utils-current-exe.md
diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs
@@ -83,9 +83,7 @@ mod starting_binary;
 /// [Hard Link]: https://en.wikipedia.org/wiki/Hard_link
 /// [See the patch that enabled this]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=800179c9b8a1e796e441674776d11cd4c05d61d7
 pub fn current_exe() -> std::io::Result<PathBuf> {
-  self::starting_binary::STARTING_BINARY
-    .cloned()
-    .map(|p| dunce::simplified(&p).to_path_buf())
+  self::starting_binary::STARTING_BINARY.cloned()
 }
 
 /// Try to determine the current target triple.

diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -102,6 +102,7 @@ cocoa = "0.24"
 objc = "0.2"
 
 [target."cfg(windows)".dependencies]
+dunce = "1"
 webview2-com = "0.19.1"
 win7-notifications = { version = "0.4", optional = true }
 

diff --git a/core/tauri/src/updater/core.rs b/core/tauri/src/updater/core.rs
@@ -831,7 +831,7 @@ fn copy_files_and_run<R: Read + Seek>(
       // we need to wrap the current exe path in quotes for Start-Process
       let mut current_executable = std::ffi::OsString::new();
       current_executable.push("\"");
-      current_executable.push(current_exe()?);
+      current_executable.push(dunce::simplified(&current_exe()?));
       current_executable.push("\"");
 
       let mut mis_path = std::ffi::OsString::new();