From f44d432b6a7c2918e337eed88c4d23d0943e8e49 Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Thu, 12 May 2022 13:35:52 -0600 Subject: [PATCH] no tar for scripts --- backend/src/install/mod.rs | 9 ++++++--- backend/src/s9pk/mod.rs | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/src/install/mod.rs b/backend/src/install/mod.rs index f4e99b5ae..498c2375f 100644 --- a/backend/src/install/mod.rs +++ b/backend/src/install/mod.rs @@ -1123,9 +1123,12 @@ pub async fn install_s9pk( if tokio::fs::metadata(&script_dir).await.is_err() { tokio::fs::create_dir_all(&script_dir).await?; } - if let Some(hdl) = rdr.scripts().await? { - let mut tar = tokio_tar::Archive::new(hdl); - tar.unpack(script_dir).await?; + if let Some(mut hdl) = rdr.scripts().await? { + tokio::io::copy( + &mut hdl, + &mut File::open(script_dir.join("embassy.js")).await?, + ) + .await?; } Ok(()) diff --git a/backend/src/s9pk/mod.rs b/backend/src/s9pk/mod.rs index a75221d3e..c611f4faa 100644 --- a/backend/src/s9pk/mod.rs +++ b/backend/src/s9pk/mod.rs @@ -106,9 +106,8 @@ pub fn pack(#[context] ctx: SdkContext, #[arg] path: Option) -> Result< std::io::Cursor::new(assets.into_inner()?) }) .scripts({ - let mut scripts = tar::Builder::new(Vec::new()); - scripts.append_dir_all("scripts", path.join(manifest.assets.scripts_path()))?; - std::io::Cursor::new(scripts.into_inner()?) + let script_path = path.join(manifest.assets.scripts_path()).join("embassy.js"); + File::open(script_path)? }) .build() .pack(&ctx.developer_key()?)?;