From e97a2e6717e75c70c5474f2d211682565909e557 Mon Sep 17 00:00:00 2001
From: Rahul Singhal <rahul.singhal@guavus.com>
Date: Sun, 4 May 2014 11:08:39 -0700
Subject: [PATCH] SPARK-1658: Correctly identify if maven is installed and
working
The current test is checking the exit code of "tail" rather than "mvn".
This new check will make sure that mvn is installed and was able to
execute the "version command".
Author: Rahul Singhal <rahul.singhal@guavus.com>
Closes #580 from rahulsinghaliitd/SPARK-1658 and squashes the following commits:
83c0313 [Rahul Singhal] SPARK-1658: Correctly identify if maven is installed and working
bf821b9 [Rahul Singhal] SPARK-1658: Correctly identify if maven is installed and working
---
make-distribution.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/make-distribution.sh b/make-distribution.sh
index c05dcd89d9..dc8aa56a2e 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -43,8 +43,9 @@
FWDIR="$(cd `dirname $0`; pwd)"
DISTDIR="$FWDIR/dist"
-VERSION=$(mvn help:evaluate -Dexpression=project.version | grep -v "INFO" | tail -n 1)
-if [ $? == -1 ] ;then
+set -o pipefail
+VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "INFO" | tail -n 1)
+if [ $? != 0 ]; then
echo -e "You need Maven installed to build Spark."
echo -e "Download Maven from https://maven.apache.org."
exit -1;
--
GitLab