diff options
| author | Matthew Farrellee <matt@redhat.com> | 2014-06-23 11:24:05 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-23 11:24:05 -0700 |
| commit | 853a2b951d4c7f6c6c37f53b465b3c7b77691b7c (patch) | |
| tree | 5ef8e8a11568fbba0b8ce3983b04979c18350189 /make-distribution.sh | |
| parent | b88238faeed8ba723986cf78d64f84965facb236 (diff) | |
| download | spark-853a2b951d4c7f6c6c37f53b465b3c7b77691b7c.tar.gz spark-853a2b951d4c7f6c6c37f53b465b3c7b77691b7c.tar.bz2 spark-853a2b951d4c7f6c6c37f53b465b3c7b77691b7c.zip | |
Fix mvn detection
When mvn is not detected (not in executor's path), 'set -e' causes the
detection to terminate the script before the helpful error message can
be displayed.
Author: Matthew Farrellee <matt@redhat.com>
Closes #1181 from mattf/master-0 and squashes the following commits:
506549f [Matthew Farrellee] Fix mvn detection
Diffstat (limited to 'make-distribution.sh')
| -rwxr-xr-x | make-distribution.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make-distribution.sh b/make-distribution.sh index ae52b4976d..6f708e0ebf 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -89,12 +89,12 @@ if [ -z "$JAVA_HOME" ]; then exit -1 fi -VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "INFO" | tail -n 1) -if [ $? != 0 ]; then +if ! which mvn &>/dev/null; then echo -e "You need Maven installed to build Spark." echo -e "Download Maven from https://maven.apache.org/" exit -1; fi +VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "INFO" | tail -n 1) JAVA_CMD="$JAVA_HOME"/bin/java JAVA_VERSION=$("$JAVA_CMD" -version 2>&1) |