From 06cdb5d191897dcafd93dea9cf23e7a1a1708d8f Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Thu, 20 Jul 2023 13:09:44 +0200 Subject: Bump libthermite to 0.7.0-alpha.1 --- src-tauri/Cargo.lock | 5 +++-- src-tauri/Cargo.toml | 2 +- src-tauri/src/mod_management/mod.rs | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index d57c1752..e0d510c6 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1993,12 +1993,13 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libthermite" -version = "0.7.0-alpha" +version = "0.7.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3927ebe9945316ba6a70f4384045fba7da9261e23b44faa7fddf9238f8916fa" +checksum = "fccf09f4637fd1437d1c5bb05fe7949dfdbe276d0ea2985239101eecd7eca0f4" dependencies = [ "flate2", "json5", + "lazy_static", "regex", "serde", "serde_json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 261e0b9d..5c2e7b94 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -33,7 +33,7 @@ steamlocate = "1.2" # Error messages anyhow = "1.0" # libthermite for Northstar/mod install handling -libthermite = { version = "0.7.0-alpha", features = ["proton"] } +libthermite = { version = "0.7.0-alpha.1", features = ["proton"] } # zip stuff zip = "0.6.2" # Regex diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs index cef7ff71..c8b0fde8 100644 --- a/src-tauri/src/mod_management/mod.rs +++ b/src-tauri/src/mod_management/mod.rs @@ -575,12 +575,13 @@ pub async fn fc_download_mod_and_install( // Get directory to install to made up of packages directory and Thunderstore mod string let install_directory = format!( - "{}/R2Northstar/packages/{}", - game_install.game_path, thunderstore_mod_string + "{}/R2Northstar/packages/", + game_install.game_path ); // Extract the mod to the mods directory match thermite::core::manage::install_with_sanity( + thunderstore_mod_string, temp_file.file(), std::path::Path::new(&install_directory), fc_sanity_check, -- cgit v1.2.3