summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-02-21 20:56:11 +0000
committerbors <bors@rust-lang.org>2020-02-21 20:56:11 +0000
commitc228a06e49ac415e5187b43547a588b50bbe6dfd (patch)
tree09503a41ec46461daf59f99ae0c0bc30b0b880a2
parent83bbd9e82e98b4ec1ab81a1d55bb8688e920a905 (diff)
parent17d0951e66fda8e11b204d5c4c41a0d5e22e78f7 (diff)
Auto merge of #272 - QuintenJohnson:fix/installation-warning-messages, r=fmoko
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.
-rwxr-xr-xinstall.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/install.sh b/install.sh
index 9cd6048..85bdad7 100755
--- a/install.sh
+++ b/install.sh
@@ -7,7 +7,7 @@ if [ -x "$(command -v git)" ]
then
echo "SUCCESS: Git is installed"
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/!"
exit 1
fi
@@ -16,7 +16,7 @@ if [ -x "$(command -v rustc)" ]
then
echo "SUCCESS: Rust is installed"
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!"
exit 1
fi
@@ -25,7 +25,7 @@ if [ -x "$(command -v cargo)" ]
then
echo "SUCCESS: Cargo is installed"
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!"
exit 1
fi
@@ -75,7 +75,7 @@ MinRustVersion=1.31
vercomp $RustVersion $MinRustVersion
if [ $? -eq 2 ]
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'"
exit 1
else