You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/10/13 23:11:14 UTC
spark git commit: [SPARK-11052] Spaces in the build dir causes failures in the build/mv…
Repository: spark
Updated Branches:
refs/heads/master b3ffac517 -> 0d1b73b78
[SPARK-11052] Spaces in the build dir causes failures in the build/mv…
…n script
Author: trystanleftwich <tr...@atscale.com>
Closes #9065 from trystanleftwich/SPARK-11052.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0d1b73b7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0d1b73b7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0d1b73b7
Branch: refs/heads/master
Commit: 0d1b73b78b600420121ea8e58ff659ae8b4feebe
Parents: b3ffac5
Author: trystanleftwich <tr...@atscale.com>
Authored: Tue Oct 13 22:11:08 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Tue Oct 13 22:11:08 2015 +0100
----------------------------------------------------------------------
build/mvn | 10 +++++-----
make-distribution.sh | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0d1b73b7/build/mvn
----------------------------------------------------------------------
diff --git a/build/mvn b/build/mvn
index ec0380a..7603ea0 100755
--- a/build/mvn
+++ b/build/mvn
@@ -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
http://git-wip-us.apache.org/repos/asf/spark/blob/0d1b73b7/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 62c0ba6..24418ac 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org