From 146f6f441732180a8a11b9abdf83d6c5047d0619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 20 Jan 2019 14:05:01 +0000 Subject: [PATCH] do not fail because of missing rustup components on nightly --- common/configure_fresh_system.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh index 39b79285..a86e15ad 100755 --- a/common/configure_fresh_system.sh +++ b/common/configure_fresh_system.sh @@ -103,9 +103,14 @@ if [[ -z $NORUST ]]; then chmod a+x "$RUSTUP_TEMP" "$RUSTUP_TEMP" -y rm -f "$RUSTUP_TEMP" + + set +e rustup update + set -e rustup install stable + set +e rustup install nightly + set -e rustup default stable rustup component add rls --toolchain stable @@ -114,8 +119,13 @@ if [[ -z $NORUST ]]; then rustup component add rust-analysis --toolchain stable rustup component add rust-src --toolchain stable + set +e + rustup component add rls --toolchain nightly + rustup component add clippy --toolchain nightly + rustup component add rustfmt --toolchain nightly rustup component add rust-analysis --toolchain nightly rustup component add rust-src --toolchain nightly + set -e export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib