diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-27 16:52:17 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-03-07 17:47:56 +0100 |
| commit | 341a4863fabe8c67b1b72c6d3183ee824878f950 (patch) | |
| tree | d5ee79ce59387b3c243387585aafbb5dfb8a3ebd /scripts | |
| parent | 05339134de9d3977002752b79b5f280f33ab1993 (diff) | |
| download | rust-341a4863fabe8c67b1b72c6d3183ee824878f950.tar.gz rust-341a4863fabe8c67b1b72c6d3183ee824878f950.zip | |
Use the new component dependency option of the rust-toolchain file (take 2)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cargo.sh | 2 | ||||
| -rwxr-xr-x | scripts/rustup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cargo.sh b/scripts/cargo.sh index 669d2d45b71..1daa5a78f7b 100755 --- a/scripts/cargo.sh +++ b/scripts/cargo.sh @@ -4,7 +4,7 @@ dir=$(dirname "$0") source "$dir/config.sh" # read nightly compiler from rust-toolchain file -TOOLCHAIN=$(cat "$dir/rust-toolchain") +TOOLCHAIN=$(cat "$dir/rust-toolchain" | grep channel | sed "s/channel = \"\(.*\)\"/\1/") cmd=$1 shift || true diff --git a/scripts/rustup.sh b/scripts/rustup.sh index 694945a87c2..fa7557653d8 100755 --- a/scripts/rustup.sh +++ b/scripts/rustup.sh @@ -8,7 +8,7 @@ case $1 in echo "=> Installing new nightly" rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists - echo "nightly-${TOOLCHAIN}" > rust-toolchain + sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain rustup component add rustfmt || true echo "=> Uninstalling all old nighlies" |