From a663ae0e6c775bbae80d62989d8d6d2c6dd3f3a5 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 17 Nov 2023 12:37:15 -0300 Subject: [PATCH] fix macos tests --- crates/packager/src/lib.rs | 7 +++++-- crates/updater/src/lib.rs | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/packager/src/lib.rs b/crates/packager/src/lib.rs index 6ed4781a..d80f83af 100644 --- a/crates/packager/src/lib.rs +++ b/crates/packager/src/lib.rs @@ -81,7 +81,7 @@ #![cfg_attr(doc_cfg, feature(doc_cfg))] #![deny(missing_docs)] -use std::path::PathBuf; +use std::{io::Write, path::PathBuf}; mod codesign; mod error; @@ -154,7 +154,10 @@ pub fn sign_outputs( let zip = path.with_extension(extension); let dest_file = util::create_file(&zip)?; let gzip_encoder = libflate::gzip::Encoder::new(dest_file)?; - util::create_tar_from_dir(path, gzip_encoder)?; + let writer = util::create_tar_from_dir(path, gzip_encoder)?; + let mut dest_file = writer.finish().into_result()?; + dest_file.flush()?; + package.paths.push(zip); package.paths.last().unwrap() } else { diff --git a/crates/updater/src/lib.rs b/crates/updater/src/lib.rs index bde57863..6369bfd4 100644 --- a/crates/updater/src/lib.rs +++ b/crates/updater/src/lib.rs @@ -734,9 +734,7 @@ impl Update { for entry in archive.entries()? { let mut entry = entry?; - // skip the first folder (should be the app name) - let collected_path: PathBuf = entry.path()?.iter().skip(1).collect(); - let extraction_path = &self.extract_path.join(collected_path); + let extraction_path = &self.extract_path.join(entry.path()?); // if something went wrong during the extraction, we should restore previous app if let Err(err) = entry.unpack(extraction_path) {