squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source 
build: check if RTIM is not installed

changelog: none
This commit is contained in:
bors 2019-11-29 18:50:51 +00:00
commit 059568faeb
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
setup-toolchain.sh
View file

@ -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.]*")