diff --git a/src/main.rs b/src/main.rs index 176f2d1..2c20f6d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,20 +51,23 @@ async fn launch() -> _ { ..Default::default() }) .mount_assets() - .mount("/", routes![ - routes::index_page, - routes::pkg_route, - routes::push::upload_pkg, - routes::user::login, - routes::user::login_post, - routes::user::account_page, - routes::ui::pkg_ui, - routes::ui::repo_ui, - routes::user::new_api_key, - routes::user::end_session, - routes::user::change_password, - routes::user::change_password_post - ]) + .mount( + "/", + routes![ + routes::index_page, + routes::pkg_route, + routes::push::upload_pkg, + routes::user::login, + routes::user::login_post, + routes::user::account_page, + routes::ui::pkg_ui, + routes::ui::repo_ui, + routes::user::new_api_key, + routes::user::end_session, + routes::user::change_password, + routes::user::change_password_post + ], + ) .manage(config) .manage(shell) } diff --git a/src/pkg/package.rs b/src/pkg/package.rs index cf8fb7a..4ec1037 100644 --- a/src/pkg/package.rs +++ b/src/pkg/package.rs @@ -527,7 +527,7 @@ pub fn repo_add(db_file: &str, pkg_file: &str) { pub fn read_file_tar(tar: &Path, file_path: &str) -> Option { let output = Command::new("tar") - .arg("-xO") // Extract to stdout (-O) + .arg("-xOJ") // Extract to stdout (-O) .arg("-f") .arg(tar) .arg(file_path) @@ -543,7 +543,7 @@ pub fn read_file_tar(tar: &Path, file_path: &str) -> Option { pub fn read_file_tar_raw(tar_data: &[u8], file_path: &str) -> Option { let mut output = Command::new("tar") - .arg("-xO") // Extract to stdout (-O) + .arg("-xOJ") // Extract to stdout (-O) .arg("-f") .arg("-") // Indicate that the file input comes from stdin .arg(file_path)