From 2238e5001b8e31608c99384531e83410cdd558aa Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 04:31:55 +0000
Subject: [PATCH] `solana-install init` can now select a pre-release from
 Github (#15936)

(cherry picked from commit d9176c1903f8142079a1926fe1b56cafbbc2f49c)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 install/src/command.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/src/command.rs b/install/src/command.rs
index e5669f9f11..e6583d26b2 100644
--- a/install/src/command.rs
+++ b/install/src/command.rs
@@ -863,6 +863,7 @@ fn semver_of(string: &str) -> Result<semver::Version, String> {
 
 fn check_for_newer_github_release(
     version_filter: Option<semver::VersionReq>,
+    prerelease_allowed: bool,
 ) -> reqwest::Result<Option<String>> {
     let url =
         reqwest::Url::parse("https://api.github.com/repos/solana-labs/solana/releases").unwrap();
@@ -882,7 +883,7 @@ fn check_for_newer_github_release(
                  prerelease,
              }| {
                 if let Ok(version) = semver_of(&tag_name) {
-                    if !prerelease
+                    if (prerelease_allowed || !prerelease)
                         && version_filter
                             .as_ref()
                             .map_or(true, |version_filter| version_filter.matches(&version))
@@ -937,6 +938,7 @@ pub fn init_or_update(config_file: &str, is_init: bool, check_only: bool) -> Res
                         current_release_semver
                     ))
                     .ok(),
+                    is_init,
                 )
                 .map_err(|err| err.to_string())?;
                 progress_bar.finish_and_clear();