OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #4168 - lzutao:fix-script, r=flip1995

Browse Source 
Do not install rustup-toolchain if it is in PATH

I find it quiet annoying because I manually build `rustup-toolchain-install-master`
and install it in `PATH` other than in `~/.cargo/bin`. So everytime I run the script,
it always reinstall `rustup-toolchain-install-master` for me.

changelog: none
This commit is contained in:
bors 2019-06-03 09:39:23 +00:00
commit 20da8f45c6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup-toolchain.sh
View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
# Set up the appropriate rustc toolchain # Set up the appropriate rustc toolchain
cd $(dirname $0) cd "$(dirname "$0")"
if ! command -v rustup-toolchain-install-master > /dev/null; then
cargo install rustup-toolchain-install-master --debug
fi
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}') 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 rustup-toolchain-install-master -f -n master "$RUSTC_HASH"
rustup override set master rustup override set master