diff options
| author | Venkata Ramana Gollamudi <ramana.gollamudi@huawei.com> | 2015-02-12 14:44:21 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-02-12 14:44:38 -0800 |
| commit | b78a686eb1d941b6899c4d0815fc9b8803837e73 (patch) | |
| tree | 1e2df753db2adb8133d7f2f405f581fa76d7f04f | |
| parent | 64254eeec491af969264900c1d992081b2b635b4 (diff) | |
| download | spark-b78a686eb1d941b6899c4d0815fc9b8803837e73.tar.gz spark-b78a686eb1d941b6899c4d0815fc9b8803837e73.tar.bz2 spark-b78a686eb1d941b6899c4d0815fc9b8803837e73.zip | |
[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>
| -rwxr-xr-x | bin/compute-classpath.sh | 4 | ||||
| -rwxr-xr-x | bin/run-example | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 049b4a8515..8a3363ae62 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 diff --git a/bin/run-example b/bin/run-example index c567acf9a6..a106411392 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 |