diff --git a/.gitignore b/.gitignore index c3f8ef8..833ecdb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ Cargo.lock /pkg /tmp -/data.tar.zst \ No newline at end of file +/assets.tar.zst \ No newline at end of file diff --git a/pack_assets.sh b/pack_assets.sh index 23dea6a..16b1307 100755 --- a/pack_assets.sh +++ b/pack_assets.sh @@ -1,4 +1,4 @@ #!/bin/bash -rm -fr data.tar.zst | true +rm -fr assets.tar.zst | true cd assets -tar -I 'zstd --ultra -22' -cf ../data.tar.zst *.* \ No newline at end of file +tar -I 'zstd --ultra -22' -cf ../assets.tar.zst *.* \ No newline at end of file diff --git a/src/egui_app.rs b/src/egui_app.rs index b6e1254..b13a77f 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -68,7 +68,7 @@ lazy_static::lazy_static! { log_helper("Loading assets..."); let mut tar_file_data = Vec::new(); - let _ = ruzstd::StreamingDecoder::new(&mut include_bytes!("../data.tar.zst").as_slice()).unwrap().read_to_end(&mut tar_file_data).unwrap(); + let _ = ruzstd::StreamingDecoder::new(&mut include_bytes!("../assets.tar.zst").as_slice()).expect("failed to decompress tarball").read_to_end(&mut tar_file_data).expect("failed to read asset contents"); let mut tar_archive = tar::Archive::new(&*tar_file_data);