Skip to content

Commit

Permalink
[SPARK-11052] Spaces in the build dir causes failures in the build/mv…
Browse files Browse the repository at this point in the history
…n script

Author: trystanleftwich <trystan@atscale.com>

Closes apache#9065 from trystanleftwich/SPARK-11052.
  • Loading branch information
trystanleftwich authored and srowen committed Oct 13, 2015
1 parent b3ffac5 commit 0d1b73b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build/mvn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion make-distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0d1b73b

Please sign in to comment.