From e62e5fa6f6f58068ec168b0a4ecb63309ff2fc46 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Mon, 26 Sep 2022 19:25:43 +0900 Subject: [PATCH] changed output new version hayabusa data --- src/main.rs | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main.rs b/src/main.rs index d1e384ce..981ff7c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -128,27 +128,6 @@ impl App { "v{}", configs::CONFIG.read().unwrap().app.get_version().unwrap() ); - if latest_version_data.is_some() - && now_version != latest_version_data.as_ref().unwrap_or(now_version) - { - write_color_buffer( - &BufferWriter::stdout(ColorChoice::Always), - None, - &format!( - "There is a new version of Hayabusa: {}", - latest_version_data.unwrap().replace('\"', "") - ), - true, - ) - .ok(); - write_color_buffer( - &BufferWriter::stdout(ColorChoice::Always), - None, - "You can download it at https://github.com/Yamato-Security/hayabusa/releases", - true, - ) - .ok(); - } match Update::update_rules(configs::CONFIG.read().unwrap().args.rules.to_str().unwrap()) { @@ -168,6 +147,33 @@ impl App { } } println!(); + if latest_version_data.is_some() + && now_version + != &latest_version_data + .as_ref() + .unwrap_or(now_version) + .replace('\"', "") + { + write_color_buffer( + &BufferWriter::stdout(ColorChoice::Always), + None, + &format!( + "There is a new version of Hayabusa: {}", + latest_version_data.unwrap().replace('\"', "") + ), + true, + ) + .ok(); + write_color_buffer( + &BufferWriter::stdout(ColorChoice::Always), + None, + "You can download it at https://github.com/Yamato-Security/hayabusa/releases", + true, + ) + .ok(); + } + println!(); + return; } // 実行時のexeファイルのパスをベースに変更する必要があるためデフォルトの値であった場合はそのexeファイルと同一階層を探すようにする