diff --git a/src/main.rs b/src/main.rs index 07afa0b..3d4f301 100644 --- a/src/main.rs +++ b/src/main.rs @@ -374,9 +374,7 @@ fn arg_remove_value(args: &mut Vec, arg: &str) { async fn main() { #[cfg(windows)] setup_env(); - let mut args: Vec = env::args().collect(); - let original_args = args.clone(); if arg_bool(&args, "--help") { println!("CLI Args:"); @@ -429,7 +427,7 @@ async fn main() { let mut cfg = config::load(install_path.join("alterware-launcher.json")); if !arg_bool(&args, "--skip-launcher-update") && !cfg.skip_self_update { - self_update::run(cfg.update_only, original_args); + self_update::run(cfg.update_only); } else { arg_remove(&mut args, "--skip-launcher-update"); } diff --git a/src/self_update.rs b/src/self_update.rs index e7eb854..554f57d 100644 --- a/src/self_update.rs +++ b/src/self_update.rs @@ -26,10 +26,10 @@ pub fn run(_update_only: bool, _args: Vec) { } #[cfg(windows)] -pub fn restart(args: Vec) -> std::io::Error { +pub fn restart() -> std::io::Error { use std::os::windows::process::CommandExt; match std::process::Command::new(std::env::current_exe().unwrap()) - .args(args.into_iter().skip(1)) + .args(std::env::args().skip(1)) .creation_flags(0x00000010) // CREATE_NEW_CONSOLE .spawn() { @@ -39,7 +39,7 @@ pub fn restart(args: Vec) -> std::io::Error { } #[cfg(windows)] -pub fn run(update_only: bool, args: Vec) { +pub fn run(update_only: bool) { use std::{fs, path::PathBuf}; use crate::http; @@ -81,7 +81,7 @@ pub fn run(update_only: bool, args: Vec) { } else { "alterware-launcher.exe" }; - println!("{}", launcher_name); + http::download_file( &format!( "{}/download/{}", @@ -101,7 +101,7 @@ pub fn run(update_only: bool, args: Vec) { // restarting spawns a new console, automation should manually restart on exit code 201 if !update_only { - let restart_error = restart(args).to_string(); + let restart_error = restart().to_string(); println!("Failed to restart launcher: {}", restart_error); println!("Please restart the launcher manually."); misc::stdin();