Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

no tar for scripts

Browse Source
This commit is contained in:
Keagan McClelland
2022-05-12 13:35:52 -06:00
parent 93ee418f65
commit f44d432b6a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/install/mod.rs
View File

@@ -1123,9 +1123,12 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
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(())

5
backend/src/s9pk/mod.rs
View File

@@ -106,9 +106,8 @@ pub fn pack(#[context] ctx: SdkContext, #[arg] path: Option<PathBuf>) -> 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()?)?;