diff options
author | trystanleftwich <trystan@atscale.com> | 2015-10-13 22:11:08 +0100 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2015-10-13 22:11:08 +0100 |
commit | 0d1b73b78b600420121ea8e58ff659ae8b4feebe (patch) | |
tree | ed00f7fdf18a23fda8fa41c9619796d7ef4a8c99 | |
parent | b3ffac5178795f2d8e7908b3e77e8e89f50b5f6f (diff) | |
download | spark-0d1b73b78b600420121ea8e58ff659ae8b4feebe.tar.gz spark-0d1b73b78b600420121ea8e58ff659ae8b4feebe.tar.bz2 spark-0d1b73b78b600420121ea8e58ff659ae8b4feebe.zip |
[SPARK-11052] Spaces in the build dir causes failures in the build/mv…
…n script
Author: trystanleftwich <trystan@atscale.com>
Closes #9065 from trystanleftwich/SPARK-11052.
-rwxr-xr-x | build/mvn | 10 | ||||
-rwxr-xr-x | make-distribution.sh | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -104,8 +104,8 @@ install_scala() { "scala-${scala_version}.tgz" \ "scala-${scala_version}/bin/scala" - SCALA_COMPILER="$(cd "$(dirname ${scala_bin})/../lib" && pwd)/scala-compiler.jar" - SCALA_LIBRARY="$(cd "$(dirname ${scala_bin})/../lib" && pwd)/scala-library.jar" + SCALA_COMPILER="$(cd "$(dirname "${scala_bin}")/../lib" && pwd)/scala-compiler.jar" + SCALA_LIBRARY="$(cd "$(dirname "${scala_bin}")/../lib" && pwd)/scala-library.jar" } # Setup healthy defaults for the Zinc port if none were provided from @@ -135,10 +135,10 @@ cd "${_CALLING_DIR}" # Now that zinc is ensured to be installed, check its status and, if its # not running or just installed, start it -if [ -n "${ZINC_INSTALL_FLAG}" -o -z "`${ZINC_BIN} -status -port ${ZINC_PORT}`" ]; then +if [ -n "${ZINC_INSTALL_FLAG}" -o -z "`"${ZINC_BIN}" -status -port ${ZINC_PORT}`" ]; then export ZINC_OPTS=${ZINC_OPTS:-"$_COMPILE_JVM_OPTS"} - ${ZINC_BIN} -shutdown -port ${ZINC_PORT} - ${ZINC_BIN} -start -port ${ZINC_PORT} \ + "${ZINC_BIN}" -shutdown -port ${ZINC_PORT} + "${ZINC_BIN}" -start -port ${ZINC_PORT} \ -scala-compiler "${SCALA_COMPILER}" \ -scala-library "${SCALA_LIBRARY}" &>/dev/null fi diff --git a/make-distribution.sh b/make-distribution.sh index 62c0ba6df7..24418ace26 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -121,7 +121,7 @@ if [ $(command -v git) ]; then fi -if [ ! $(command -v "$MVN") ] ; then +if [ ! "$(command -v "$MVN")" ] ; then echo -e "Could not locate Maven command: '$MVN'." echo -e "Specify the Maven command with the --mvn flag" exit -1; |