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

Install correct version of cargo-config and xargo

Browse source
This commit is contained in:
Jeremy Soller 2020-12-24 11:20:32 -07:00
parent ce44ede67e
commit 46282ed9ed
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap.sh
View file

@ -422,10 +422,10 @@ usage()
# Looks for and installs a cargo-managed binary or subcommand # Looks for and installs a cargo-managed binary or subcommand
############################################################# #############################################################
cargoInstall() { cargoInstall() {
if [[ "`cargo install --list`" != *"$1"* ]]; then if [[ "`cargo install --list`" != *"$1 v$2"* ]]; then
cargo install $1 cargo install --force --version "$2" "$1"
else else
echo "You have $1 installed already!" echo "You have $1 version $2 installed already!"
fi fi
} }
@ -539,8 +539,8 @@ 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 rustInstall
cargoInstall cargo-config cargoInstall cargo-config 0.1.1
cargoInstall xargo cargoInstall xargo 0.3.20
echo "Cleaning up..." echo "Cleaning up..."
rm bootstrap.sh rm bootstrap.sh
echo echo