marco/rustlings-solutions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #272 - QuintenJohnson:fix/installation-warning-messages, r=fmoko

Browse Source 
fix(installation): make fatal errors more obvious

I initially ran the installation script without rust installed. The fact that the error message was labeled with WARNING made me unsure whether installation was successful or I needed to re-run after installing rust. There's an error code returned on fatal errors, but this change will make things clearer.
This commit is contained in:
bors 2020-02-21 20:56:11 +00:00
commit c228a06e49
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -7,7 +7,7 @@ if [ -x "$(command -v git)" ]
then then
echo "SUCCESS: Git is installed" echo "SUCCESS: Git is installed"
else else
echo "WARNING: Git does not seem to be installed." echo "ERROR: Git does not seem to be installed."
echo "Please download Git using your package manager or over https://git-scm.com/!" echo "Please download Git using your package manager or over https://git-scm.com/!"
exit 1 exit 1
fi fi
@ -16,7 +16,7 @@ if [ -x "$(command -v rustc)" ]
then then
echo "SUCCESS: Rust is installed" echo "SUCCESS: Rust is installed"
else else
echo "WARNING: Rust does not seem to be installed." echo "ERROR: Rust does not seem to be installed."
echo "Please download Rust using https://rustup.rs!" echo "Please download Rust using https://rustup.rs!"
exit 1 exit 1
fi fi
@ -25,7 +25,7 @@ if [ -x "$(command -v cargo)" ]
then then
echo "SUCCESS: Cargo is installed" echo "SUCCESS: Cargo is installed"
else else
echo "WARNING: Cargo does not seem to be installed." echo "ERROR: Cargo does not seem to be installed."
echo "Please download Rust and Cargo using https://rustup.rs!" echo "Please download Rust and Cargo using https://rustup.rs!"
exit 1 exit 1
fi fi
@ -75,7 +75,7 @@ MinRustVersion=1.31
vercomp $RustVersion $MinRustVersion vercomp $RustVersion $MinRustVersion
if [ $? -eq 2 ] if [ $? -eq 2 ]
then then
echo "WARNING: Rust version is too old: $RustVersion - needs at least $MinRustVersion" echo "ERROR: Rust version is too old: $RustVersion - needs at least $MinRustVersion"
echo "Please update Rust with 'rustup update'" echo "Please update Rust with 'rustup update'"
exit 1 exit 1
else else