mirror of
https://github.com/taiki-e/install-action.git
synced 2026-05-10 22:50:32 +00:00
Move cargo-binstall version output to install_cargo_binstall
This commit is contained in:
8
main.sh
8
main.sh
@@ -94,6 +94,8 @@ install_cargo_binstall() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
download "${url}" "${cargo_bin}" "cargo-binstall${exe}"
|
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
|
else
|
||||||
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall"
|
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall"
|
||||||
fi
|
fi
|
||||||
@@ -344,7 +346,10 @@ for tool in "${tools[@]}"; do
|
|||||||
linux* | darwin*) chmod +x "${cargo_bin}/${tool}${exe}" ;;
|
linux* | darwin*) chmod +x "${cargo_bin}/${tool}${exe}" ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
cargo-binstall) install_cargo_binstall ;;
|
cargo-binstall)
|
||||||
|
install_cargo_binstall
|
||||||
|
continue
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
cargo_binstall "${tool}" "${version}"
|
cargo_binstall "${tool}" "${version}"
|
||||||
continue
|
continue
|
||||||
@@ -353,7 +358,6 @@ for tool in "${tools[@]}"; do
|
|||||||
|
|
||||||
info "${tool} installed at $(type -P "${bin}")"
|
info "${tool} installed at $(type -P "${bin}")"
|
||||||
case "${bin}" in
|
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 ;;
|
cargo-*) x cargo "${tool#cargo-}" --version ;;
|
||||||
*) x "${tool}" --version ;;
|
*) x "${tool}" --version ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user