From 071f432ae188094403e8e3ae849a2f66fcc0f5a0 Mon Sep 17 00:00:00 2001 From: mojavemf Date: Fri, 3 Nov 2023 18:38:25 +0000 Subject: [PATCH 1/2] Some issues patched out --- src/main.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8151ccd..64dac45 100644 --- a/src/main.rs +++ b/src/main.rs @@ -175,30 +175,31 @@ async fn main() { let installation_directory = get_installation_directory(); debug!( - "Installation Directory: {}", - installation_directory.to_str().unwrap().bright_blue() + "Instillation Directory: {}", + format!("{:?}", installation_directory.display()).bright_blue() ); create_folder_if_not_exists(&installation_directory).await; let versions_directory = installation_directory.join("Versions"); debug!( "Versions Directory: {}", - versions_directory.to_str().unwrap().bright_blue() + format!("{:?}", versions_directory.display()).bright_blue() ); create_folder_if_not_exists(&versions_directory).await; let temp_downloads_directory = installation_directory.join("Downloads"); debug!( "Temp Downloads Directory: {}", - temp_downloads_directory.to_str().unwrap().bright_blue() + format!("{:?}", temp_downloads_directory.display()).bright_blue() ); create_folder_if_not_exists(&temp_downloads_directory).await; let current_version_directory = versions_directory.join(format!("{}", latest_client_version)); debug!( "Current Version Directory: {}", - current_version_directory.to_str().unwrap().bright_blue() + format!("{:?}", current_version_directory.display()).bright_blue() ); + create_folder_if_not_exists(¤t_version_directory).await; let latest_bootstrapper_path = current_version_directory.join(bootstrapper_filename); From 52cf2f4fff1adfdb1a326c229ff71450abdc943f Mon Sep 17 00:00:00 2001 From: mojavemf Date: Sat, 4 Nov 2023 11:20:36 +0000 Subject: [PATCH 2/2] Removed bad format macro use --- src/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 64dac45..97c53d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -55,11 +55,6 @@ async fn main() { std::process::Command::new("clear").spawn().unwrap(); } - tracing_subscriber::fmt() - .with_max_level(MAX_TRACING_LEVEL) - .pretty() - .init(); - let args: Vec = std::env::args().collect(); let base_url: &str = "www.syntax.eco"; let mut setup_url: &str = "setup.syntax.eco"; @@ -117,6 +112,11 @@ async fn main() { ); } + tracing_subscriber::fmt() + .with_max_level(MAX_TRACING_LEVEL) + .pretty() + .init(); + let http_client: Client = reqwest::Client::builder().no_gzip().build().unwrap(); debug!( "Setup Server: {} | Base Server: {}", @@ -229,7 +229,7 @@ async fn main() { match command.spawn() { Ok(_) => {} Err(e) => { - debug!(&format!("Bootstrapper errored with error {}", e)); + debug!("Bootstrapper errored with error {}", e); info("Found bootstrapper was corrupted! Downloading..."); std::fs::remove_file(latest_bootstrapper_path.clone()).unwrap(); download_file(