Fix avocado-submit script for Spark 2.

bigdatagenomics · Jun 5, 2017 · 7d0011d · 7d0011d
1 parent 664ee45
commit 7d0011d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/avocado-submit b/bin/avocado-submit
@@ -54,14 +54,14 @@ else
   ASSEMBLY_DIR="$SCRIPT_DIR/avocado-cli/target"
 fi
 
-num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^avocado-cli_[0-9A-Za-z\.-]*\.jar$" | grep -v javadoc | wc -l)"
+num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^avocado-cli[0-9A-Za-z\_\.-]*\.jar$" | grep -v javadoc | wc -l)"
 if [ "$num_jars" -eq "0" ]; then
   echo "Failed to find AVOCADO cli assembly in $ASSEMBLY_DIR." 1>&2
   echo "You need to build AVOCADO before running this program." 1>&2
   exit 1
 fi
 
-ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^avocado-cli_[0-9A-Za-z\.-]*\.jar$" | grep -v javadoc || true)"
+ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^avocado-cli[0-9A-Za-z\_\.-]*\.jar$" | grep -v javadoc || true)"
 if [ "$num_jars" -gt "1" ]; then
   echo "Found multiple AVOCADO cli assembly jars in $ASSEMBLY_DIR:" 1>&2
   echo "$ASSEMBLY_JARS" 1>&2