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

Merge branch 'master' of https://github.com/redox-os/redox

Browse source
This commit is contained in:
Jeremy Soller 2016-11-04 13:38:49 -06:00
parent 92ac91f4a5 92d9658a74
commit 243717b3b7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.sh
View file

@ -282,7 +282,7 @@ usage()
####################################################################################
rustInstall() {
# Check to see if multirust is installed, we don't want it messing with rustup
# In th future we can probably remove this but I believe it's good to have for now
# In the future we can probably remove this but I believe it's good to have for now
if [ -e /usr/local/lib/rustlib/uninstall.sh ] ; then
echo "It appears that multirust is installed on your system."
echo "This tool has been deprecated by the maintainer, and will cause issues."
@ -405,7 +405,7 @@ boot()
if [ "$1" == "-h" ]; then
usage
elif [ "$1" == "-u" ]; then
git pull origin master
git pull upstream master
git submodule update --recursive --init
rustup update nightly
exit