sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps: Skip installing Rust if rustup is available

Browse Source 
Saves time and prevents errors with trying to install rustup twice or
potentially overriding the user's default toolchain.
This commit is contained in:
Tim Crawford 2021-02-22 15:47:15 -07:00 committed by Jeremy Soller
parent 71534e736c
commit ba99aec1b7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/deps.sh
View File

@ -40,12 +40,14 @@ fi
msg "Initializing submodules" msg "Initializing submodules"
git submodule update --init --recursive git submodule update --init --recursive
if ! which rustup &> /dev/null; then
msg "Installing Rust" msg "Installing Rust"
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --default-toolchain nightly | sh -s -- -y --default-toolchain none
msg "Loading Rust environment" msg "Loading Rust environment"
source "${HOME}/.cargo/env" source "${HOME}/.cargo/env"
fi
msg "Installing pinned Rust toolchain" msg "Installing pinned Rust toolchain"
rustup toolchain install "$(cat rust-toolchain)" rustup toolchain install "$(cat rust-toolchain)"