diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
| commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
| tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /bin/compute-classpath.sh | |
| parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
| parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
| download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip | |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'bin/compute-classpath.sh')
| -rwxr-xr-x | bin/compute-classpath.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 40555089fc..0c82310421 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -26,7 +26,7 @@ SCALA_VERSION=2.10 FWDIR="$(cd `dirname $0`/..; pwd)" # Load environment variables from conf/spark-env.sh, if it exists -if [ -e $FWDIR/conf/spark-env.sh ] ; then +if [ -e "$FWDIR/conf/spark-env.sh" ] ; then . $FWDIR/conf/spark-env.sh fi |