diff --git a/build.rs b/build.rs index d115e97..24664fb 100644 --- a/build.rs +++ b/build.rs @@ -1,23 +1,9 @@ -use std::env; use std::fs; +use std::env; use winres::WindowsResource; - -#[cfg(debug_assertions)] -fn main() { - let build_date = chrono::Utc::now() - .format("%Y-%m-%d %H:%M:%S UTC") - .to_string(); - let out_dir = env::var("OUT_DIR").unwrap(); - let dest_path = format!("{}/build_date.txt", out_dir); - fs::write(&dest_path, &build_date).unwrap(); -} - -#[cfg(not(debug_assertions))] fn main() { // Get the current build date and time - let build_date = chrono::Utc::now() - .format("%Y-%m-%d %H:%M:%S UTC") - .to_string(); + let build_date = chrono::Utc::now().format("%Y-%m-%d %H:%M:%S UTC").to_string(); // Write the build date to a file let out_dir = env::var("OUT_DIR").unwrap(); @@ -41,4 +27,4 @@ fn main() { } println!("cargo:rerun-if-changed=build.rs"); -} +} \ No newline at end of file diff --git a/src/constants/mod.rs b/src/constants/mod.rs index 1308411..d5e1e23 100644 --- a/src/constants/mod.rs +++ b/src/constants/mod.rs @@ -6,8 +6,8 @@ pub const FILES_TO_DOWNLOAD: [[&str; 2]; 17] = [ ["redist.zip", "./"], ["content-textures.zip", "./content/textures"], ["content-textures2.zip", "./content/textures"], - ["content-textures3.zip", "./PlatformContent/pc/textures"], - ["content-terrain.zip", "./PlatformContent/pc/terrain"], + ["content-textures3.zip", "./content/textures"], + ["content-terrain.zip", "./content/terrain"], ["content-fonts.zip", "./content/fonts"], ["content-sounds.zip", "./content/sounds"], ["content-scripts.zip", "./content/scripts"], diff --git a/src/main.rs b/src/main.rs index ec4e162..97c53d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,6 @@ use md5; use metadata::LevelFilter; use reqwest::Client; use std::path::PathBuf; -use tokio::fs::create_dir_all; use tokio::task::JoinSet; use zip_extract; @@ -231,9 +230,9 @@ async fn main() { Ok(_) => {} Err(e) => { debug!("Bootstrapper errored with error {}", e); - info!("Found bootstrapper was corrupted! Downloading..."); + info("Found bootstrapper was corrupted! Downloading..."); std::fs::remove_file(latest_bootstrapper_path.clone()).unwrap(); - download_to_file( + download_file( &http_client, &format!( "https://{}/{}-{}", @@ -290,10 +289,7 @@ async fn main() { let mut set = JoinSet::new(); - for [value, path] in FILES_TO_DOWNLOAD { - create_dir_all(current_version_directory.join(path)) - .await - .unwrap(); + for [value, _] in FILES_TO_DOWNLOAD { set.spawn(download_and_extract( value.to_string(), version_url_prefix.clone(), diff --git a/src/util/mod.rs b/src/util/mod.rs index d797ff9..5927a4c 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -4,6 +4,7 @@ use colored::*; use dirs::data_local_dir; use futures_util::StreamExt; +use md5; use reqwest::Client; use reqwest::ClientBuilder; use std::io::Cursor; @@ -15,6 +16,7 @@ use zip_extract; use crate::constants::*; use tracing::*; +#[cfg(not(target_os = "windows"))] use std::io::prelude::*; /* #[cfg(not(target_os = "windows"))]