vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improvements for rust dependencies in bootstrap

Browse source
This commit is contained in:
Jeremy Soller 2020-12-24 11:33:16 -07:00
parent a5e352ec28
commit 8d024eb405
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bootstrap.sh
View file

@ -449,8 +449,6 @@ rustInstall() {
echo "Please manually uninstall multirust and any other versions of rust, then re-run bootstrap." echo "Please manually uninstall multirust and any other versions of rust, then re-run bootstrap."
exit exit
fi fi
else
echo "Old multirust not installed, you are good to go."
fi fi
# If rustup is not installed we should offer to install it for them # If rustup is not installed we should offer to install it for them
if [ -z "$(which rustup)" ]; then if [ -z "$(which rustup)" ]; then
@ -467,7 +465,6 @@ rustInstall() {
echo "export PATH=\"\$HOME/.cargo/bin:\$PATH\"" >> ~/.bashrc echo "export PATH=\"\$HOME/.cargo/bin:\$PATH\"" >> ~/.bashrc
# source the variables so that we can execute rustup commands in the current shell # source the variables so that we can execute rustup commands in the current shell
source ~/.cargo/env source ~/.cargo/env
rustup default nightly
else else
echo "Rustup will not be installed!" echo "Rustup will not be installed!"
fi fi
@ -479,22 +476,8 @@ rustInstall() {
echo "or install rustc nightly manually (not recommended) via:" echo "or install rustc nightly manually (not recommended) via:"
echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly" echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
exit exit
fi
# If the system has rustup installed then update rustc to the latest nightly
if hash 2>/dev/null rustup; then
rustup update nightly
rustup default nightly
fi
# Check to make sure that the default rustc is the nightly
if echo "$(rustc --version)" | grep -viq "nightly" ;then
echo "It appears that you have rust installed, but it"
echo "is not the nightly version, please either install"
echo "the nightly manually (not recommended) or run this"
echo "script again, accepting the rustup install"
echo
else else
echo "Your rust install looks good!" echo "Your rust install looks good!"
echo
fi fi
} }
@ -538,9 +521,6 @@ boot()
{ {
echo "Cloning gitlab repo..." echo "Cloning gitlab repo..."
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
rustInstall
cargoInstall cargo-config 0.1.1
cargoInstall xargo 0.3.20
echo "Cleaning up..." echo "Cleaning up..."
rm bootstrap.sh rm bootstrap.sh
echo echo
@ -592,6 +572,12 @@ do
esac esac
done done
banner
rustInstall
cargoInstall cargo-config 0.1.1
cargoInstall xargo 0.3.20
if [ "$update" == "true" ]; then if [ "$update" == "true" ]; then
git pull upstream master git pull upstream master
git submodule update --recursive --init git submodule update --recursive --init
@ -599,7 +585,6 @@ if [ "$update" == "true" ]; then
exit exit
fi fi
banner
if [ "Darwin" == "$(uname -s)" ]; then if [ "Darwin" == "$(uname -s)" ]; then
osx "$emulator" osx "$emulator"
else else
@ -635,3 +620,5 @@ fi
if [ "$dependenciesonly" = false ]; then if [ "$dependenciesonly" = false ]; then
boot boot
fi fi
echo "Redox bootstrap complete!"