Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5586A10B9A for ; Wed, 11 Sep 2013 17:27:11 +0000 (UTC) Received: (qmail 60564 invoked by uid 500); 11 Sep 2013 17:27:10 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 60323 invoked by uid 500); 11 Sep 2013 17:27:09 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 60064 invoked by uid 99); 11 Sep 2013 17:27:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 17:27:06 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 11 Sep 2013 17:27:02 +0000 Received: (qmail 56626 invoked by uid 99); 11 Sep 2013 17:26:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 17:26:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9FFA48BE358; Wed, 11 Sep 2013 17:26:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.incubator.apache.org Date: Wed, 11 Sep 2013 17:26:43 -0000 Message-Id: In-Reply-To: <61ff06dabc0f4fd8954b873112436e3b@git.apache.org> References: <61ff06dabc0f4fd8954b873112436e3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/13] git commit: fix run-example script X-Virus-Checked: Checked by ClamAV on apache.org fix run-example script Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/56b94078 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/56b94078 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/56b94078 Branch: refs/heads/branch-0.8 Commit: 56b94078481786a0b0bbcbe3971ee4ef0326d694 Parents: 2425eb8 Author: Haoyuan Li Authored: Tue Sep 10 23:03:09 2013 -0700 Committer: Haoyuan Li Committed: Tue Sep 10 23:03:09 2013 -0700 ---------------------------------------------------------------------- run-example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/56b94078/run-example ---------------------------------------------------------------------- diff --git a/run-example b/run-example index 24d83ba..85557d7 100755 --- a/run-example +++ b/run-example @@ -39,14 +39,14 @@ fi # to avoid the -sources and -doc packages that are built by publish-local. EXAMPLES_DIR="$FWDIR"/examples SPARK_EXAMPLES_JAR="" -if [ -e "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9T].jar ]; then +if [ -e "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9T]*.jar ]; then # Use the JAR from the SBT build - export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9T].jar` + export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9T]*.jar` fi -if [ -e "$EXAMPLES_DIR"/target/spark-examples*[0-9T].jar ]; then +if [ -e "$EXAMPLES_DIR"/target/spark-examples*[0-9T]*.jar ]; then # Use the JAR from the Maven build # TODO: this also needs to become an assembly! - export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/spark-examples*[0-9T].jar` + export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/spark-examples*[0-9T]*.jar` fi if [[ -z $SPARK_EXAMPLES_JAR ]]; then echo "Failed to find Spark examples assembly in $FWDIR/examples/target" >&2