Move cargo-binstall version output to install_cargo_binstall

This commit is contained in:
Taiki Endo
2022-07-26 12:03:09 +09:00
parent 9fdefab8ca
commit 85064bbc1c

View File

@@ -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