Auto merge of #4856 - lzutao:rtim-non-installed, r=flip1995

build: check if RTIM is not installed changelog: none
rust-lang · Nov 29, 2019 · 059568f · 059568f
2 parents 0403687 + d9af448
commit 059568f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/setup-toolchain.sh b/setup-toolchain.sh
@@ -5,12 +5,11 @@ set -e
 
 cd "$(dirname "$0")"
 
-RTIM_PATH=$(command -v rustup-toolchain-install-master)
+RTIM_PATH=$(command -v rustup-toolchain-install-master) || INSTALLED=false
 CARGO_HOME=${CARGO_HOME:-$HOME/.cargo}
 
-# Check if people also install RTIM in other locations beside
-# ~/.cargo/bin
-if [[ "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
+# Check if RTIM is not installed or installed in other locations not in ~/.cargo/bin
+if [[ "$INSTALLED" == false || "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
     cargo +nightly install rustup-toolchain-install-master
 else
     VERSION=$(rustup-toolchain-install-master -V | grep -o "[0-9.]*")