From edbd1909dc48859bda9234deb4c96ca8489fd47d Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sun, 25 Sep 2022 17:12:29 +1000
Subject: [PATCH] Ensure that cargo-binstall 0.13.3 is used (#22)

* Ensure that 0.13.3 is used
* Remove passing deprecated `--secure` flag to `cargo-binstall`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 main.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/main.sh b/main.sh
index b520c9ec..9f54c826 100755
--- a/main.sh
+++ b/main.sh
@@ -79,12 +79,13 @@ host_triple() {
     fi
 }
 install_cargo_binstall() {
+    # https://github.com/cargo-bins/cargo-binstall/releases
+    binstall_version="0.13.3"
+
     if [[ ! -f "${cargo_bin}/cargo-binstall" ]]; then
         info "installing cargo-binstall"
 
         host_triple
-        # https://github.com/cargo-bins/cargo-binstall/releases
-        binstall_version="0.13.3"
         base_url="https://github.com/cargo-bins/cargo-binstall/releases/download/v${binstall_version}/cargo-binstall"
         case "${host}" in
             x86_64-unknown-linux-gnu) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;
@@ -110,7 +111,7 @@ install_cargo_binstall() {
         x cargo binstall -V
     else
         info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall, upgrading"
-        cargo binstall --secure --no-confirm --version '>=0.12.0' cargo-binstall
+        cargo binstall --secure --no-confirm --version "=${binstall_version}" cargo-binstall
     fi
 }
 cargo_binstall() {
@@ -121,12 +122,12 @@ cargo_binstall() {
 
     install_cargo_binstall
 
-    # --secure mode enforce downloads over secure transports only.
+    # By default, cargo-binstall enforce downloads over secure transports only.
     # As a result, http will be disabled, and it will also set
     # min tls version to be 1.2
     case "${version}" in
-        latest) cargo binstall --force --secure --no-confirm "${tool}" ;;
-        *) cargo binstall --force --secure --no-confirm --version "${version}" "${tool}" ;;
+        latest) cargo binstall --force --no-confirm "${tool}" ;;
+        *) cargo binstall --force --no-confirm --version "${version}" "${tool}" ;;
     esac
 }