From ac22f2e0312b338dc4dabe554083d5946cec3661 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 25 Sep 2022 17:08:12 +0900 Subject: [PATCH] Do not use cargo-binstall for upgrade for cargo-binstall (#23) --- main.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/main.sh b/main.sh index a89855da..f9f59a02 100755 --- a/main.sh +++ b/main.sh @@ -81,8 +81,18 @@ host_triple() { install_cargo_binstall() { # https://github.com/cargo-bins/cargo-binstall/releases binstall_version="0.13.3" + install_binstall='1' + if [[ -f "${cargo_bin}/cargo-binstall${exe}" ]]; then + if [[ "$(cargo binstall -V)" == "cargo-binstall ${binstall_version}" ]]; then + info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}" + install_binstall='' + else + info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}, but is not compatible version with install-action, upgrading" + rm "${cargo_bin}/cargo-binstall${exe}" + fi + fi - if [[ ! -f "${cargo_bin}/cargo-binstall" ]]; then + if [[ -n "${install_binstall}" ]]; then info "installing cargo-binstall" host_triple @@ -109,9 +119,6 @@ install_cargo_binstall() { download "${url}" "${cargo_bin}" "cargo-binstall${exe}" info "cargo-binstall installed at $(type -P "cargo-binstall${exe}")" x cargo binstall -V - else - info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall, upgrading" - cargo binstall --secure --no-confirm --version "=${binstall_version}" cargo-binstall fi } cargo_binstall() {