From 04e56a2f481ab413167ec7881f09fec983b2825c Mon Sep 17 00:00:00 2001 From: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:32:22 -0500 Subject: [PATCH 1/3] Switch to No for default on update (#634) --- src/common/release.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/release.rs b/src/common/release.rs index 2231129..205c269 100644 --- a/src/common/release.rs +++ b/src/common/release.rs @@ -152,7 +152,7 @@ fn get_release(beta: bool) -> Result { } fn user_wants_to_install() -> bool { - dialog::yes_no( + dialog::no_yes( "There is a new update available for the Training Modpack. \n\n\ Do you want to install it?" .to_string(), From c81ad0ad41ee72fae5066c7284994d2028842bb6 Mon Sep 17 00:00:00 2001 From: asimon-1 <40246417+asimon-1@users.noreply.github.com> Date: Sun, 17 Sep 2023 14:17:45 -0400 Subject: [PATCH 2/3] Change is_older_than_installed so that it no longer detects the current update as a new one (#639) --- src/common/release.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/release.rs b/src/common/release.rs index 205c269..efe71e5 100644 --- a/src/common/release.rs +++ b/src/common/release.rs @@ -71,7 +71,7 @@ impl Release { // // https://datatracker.ietf.org/doc/html/rfc3339#section-5.1 let current_version = CURRENT_VERSION.lock(); - self.published_at.as_str() < current_version.as_str() + self.published_at.as_str() <= current_version.as_str() } } @@ -193,7 +193,7 @@ pub fn perform_version_check() { drop(current_version); // Explicitly unlock, since we also acquire a lock in is_older_than_installed() if release_to_apply.as_ref().unwrap().is_older_than_installed() { release_to_apply = Err(anyhow!( - "Update is older than the current installed version.", + "Github version is not newer than the current installed version.", )) } } From 587db532f38b538e0609b6ed13e705bb296dad55 Mon Sep 17 00:00:00 2001 From: jugeeya Date: Sun, 17 Sep 2023 16:46:48 -0700 Subject: [PATCH 3/3] Upgrade to 6.0.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cc168ee..130faf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "training_modpack" -version = "6.0.0" +version = "6.0.1" authors = ["jugeeya "] edition = "2018"