X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=setup-toolchain.sh;h=012d26a1046b39f7db5ae5acc71c9c7a55d7e4a1;hb=83f04442ecb50441dff764f9bb05ad89656891f1;hp=f8d764b613271240c35853ba9d96bf013f93a205;hpb=47563a13eba19d0fc4b56f2cd0d5645fc81e7bc3;p=rust.git

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index f8d764b6132..012d26a1046 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
-cd $(dirname $0)
+cd "$(dirname "$0")" || exit
 
-cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
-RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
-rustup-toolchain-install-master -f -n master $RUSTC_HASH
+if ! command -v rustup-toolchain-install-master > /dev/null; then
+  cargo install \
+    --git https://github.com/kennytm/rustup-toolchain-install-master \
+    --bin rustup-toolchain-install-master \
+    --debug
+fi
+
+rustup-toolchain-install-master -f -n master -c rustc-dev
 rustup override set master