spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: [SPARK-5765][Examples]Fixed word split problem in run-example and compute-classpath
Date Thu, 12 Feb 2015 22:44:38 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 64254eeec -> b78a686eb


[SPARK-5765][Examples]Fixed word split problem in run-example and compute-classpath

Author: Venkata Ramana G <ramana.gollamudihuawei.com>

Author: Venkata Ramana Gollamudi <ramana.gollamudi@huawei.com>

Closes #4561 from gvramana/word_split and squashes the following commits:

285c8d4 [Venkata Ramana Gollamudi] Fixed word split problem in run-example and compute-classpath

(cherry picked from commit 629d0143eeb3c153dac9c65e7b556723c6b4bfc7)
Signed-off-by: Andrew Or <andrew@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b78a686e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b78a686e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b78a686e

Branch: refs/heads/branch-1.2
Commit: b78a686eb1d941b6899c4d0815fc9b8803837e73
Parents: 64254ee
Author: Venkata Ramana Gollamudi <ramana.gollamudi@huawei.com>
Authored: Thu Feb 12 14:44:21 2015 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Thu Feb 12 14:44:38 2015 -0800

----------------------------------------------------------------------
 bin/compute-classpath.sh | 4 ++--
 bin/run-example          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b78a686e/bin/compute-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 049b4a8..8a3363a 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -70,7 +70,7 @@ fi
 
 num_jars=0
 
-for f in ${assembly_folder}/spark-assembly*hadoop*.jar; do
+for f in "${assembly_folder}"/spark-assembly*hadoop*.jar; do
   if [[ ! -e "$f" ]]; then
     echo "Failed to find Spark assembly in $assembly_folder" 1>&2
     echo "You need to build Spark before running this program." 1>&2
@@ -82,7 +82,7 @@ done
 
 if [ "$num_jars" -gt "1" ]; then
   echo "Found multiple Spark assembly jars in $assembly_folder:" 1>&2
-  ls ${assembly_folder}/spark-assembly*hadoop*.jar 1>&2
+  ls "${assembly_folder}"/spark-assembly*hadoop*.jar 1>&2
   echo "Please remove all but one jar." 1>&2
   exit 1
 fi

http://git-wip-us.apache.org/repos/asf/spark/blob/b78a686e/bin/run-example
----------------------------------------------------------------------
diff --git a/bin/run-example b/bin/run-example
index c567acf..a106411 100755
--- a/bin/run-example
+++ b/bin/run-example
@@ -42,7 +42,7 @@ fi
 
 JAR_COUNT=0
 
-for f in ${JAR_PATH}/spark-examples-*hadoop*.jar; do
+for f in "${JAR_PATH}"/spark-examples-*hadoop*.jar; do
   if [[ ! -e "$f" ]]; then
     echo "Failed to find Spark examples assembly in $FWDIR/lib or $FWDIR/examples/target"
1>&2
     echo "You need to build Spark before running this program" 1>&2
@@ -54,7 +54,7 @@ done
 
 if [ "$JAR_COUNT" -gt "1" ]; then
   echo "Found multiple Spark examples assembly jars in ${JAR_PATH}" 1>&2
-  ls ${JAR_PATH}/spark-examples-*hadoop*.jar 1>&2
+  ls "${JAR_PATH}"/spark-examples-*hadoop*.jar 1>&2
   echo "Please remove all but one jar." 1>&2
   exit 1
 fi


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message