From 85064bbc1c73faca389b3e6881c86e523a4b7dd2 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Tue, 26 Jul 2022 12:03:09 +0900 Subject: [PATCH] Move cargo-binstall version output to install_cargo_binstall --- main.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main.sh b/main.sh index f68576fe..c684e3e7 100755 --- a/main.sh +++ b/main.sh @@ -94,6 +94,8 @@ install_cargo_binstall() { esac download "${url}" "${cargo_bin}" "cargo-binstall${exe}" + info "cargo-binstall installed at $(type -P "cargo-binstall${exe}")" + x cargo binstall | head 1 # cargo binstall doesn't have a normal --version flag else info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall" fi @@ -344,7 +346,10 @@ for tool in "${tools[@]}"; do linux* | darwin*) chmod +x "${cargo_bin}/${tool}${exe}" ;; esac ;; - cargo-binstall) install_cargo_binstall ;; + cargo-binstall) + install_cargo_binstall + continue + ;; *) cargo_binstall "${tool}" "${version}" continue @@ -353,7 +358,6 @@ for tool in "${tools[@]}"; do info "${tool} installed at $(type -P "${bin}")" case "${bin}" in - cargo-binstall) x cargo binstall | head 1 ;; # cargo binstall doesn't have a normal --version flag cargo-*) x cargo "${tool#cargo-}" --version ;; *) x "${tool}" --version ;; esac