diff options
| author | Daoyuan Wang <daoyuan.wang@intel.com> | 2014-12-10 13:29:27 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-12-10 13:30:45 -0800 |
| commit | e230da18f8c354b4b80416aa5277420397acf4f2 (patch) | |
| tree | e705a2360d0fb28e64fabc734983d755ab02eefb | |
| parent | faa8fd8178642ef8fce14186abc45a189042efd4 (diff) | |
| download | spark-e230da18f8c354b4b80416aa5277420397acf4f2.tar.gz spark-e230da18f8c354b4b80416aa5277420397acf4f2.tar.bz2 spark-e230da18f8c354b4b80416aa5277420397acf4f2.zip | |
[SPARK-4793] [Deploy] ensure .jar at end of line
sometimes I switch between different version and do not want to rebuild spark, so I rename assembly.jar into .jar.bak, but still caught by `compute-classpath.sh`
Author: Daoyuan Wang <daoyuan.wang@intel.com>
Closes #3641 from adrian-wang/jar and squashes the following commits:
45cbfd0 [Daoyuan Wang] ensure .jar at end of line
| -rwxr-xr-x | bin/compute-classpath.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 298641f268..685051eeed 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -68,14 +68,14 @@ else assembly_folder="$ASSEMBLY_DIR" fi -num_jars="$(ls "$assembly_folder" | grep "spark-assembly.*hadoop.*\.jar" | wc -l)" +num_jars="$(ls "$assembly_folder" | grep "spark-assembly.*hadoop.*\.jar$" | wc -l)" if [ "$num_jars" -eq "0" ]; then echo "Failed to find Spark assembly in $assembly_folder" echo "You need to build Spark before running this program." exit 1 fi if [ "$num_jars" -gt "1" ]; then - jars_list=$(ls "$assembly_folder" | grep "spark-assembly.*hadoop.*.jar") + jars_list=$(ls "$assembly_folder" | grep "spark-assembly.*hadoop.*.jar$") echo "Found multiple Spark assembly jars in $assembly_folder:" echo "$jars_list" echo "Please remove all but one jar." @@ -108,7 +108,7 @@ else datanucleus_dir="$FWDIR"/lib_managed/jars fi -datanucleus_jars="$(find "$datanucleus_dir" 2>/dev/null | grep "datanucleus-.*\\.jar")" +datanucleus_jars="$(find "$datanucleus_dir" 2>/dev/null | grep "datanucleus-.*\\.jar$")" datanucleus_jars="$(echo "$datanucleus_jars" | tr "\n" : | sed s/:$//g)" if [ -n "$datanucleus_jars" ]; then |