From e06e4b0affc00bc15498313a36edbc9b7e2aaae2 Mon Sep 17 00:00:00 2001
From: Neville Li <neville@spotify.com>
Date: Sun, 18 May 2014 13:31:23 -0700
Subject: Fix spark-submit path in spark-shell & pyspark

Author: Neville Li <neville@spotify.com>

Closes #812 from nevillelyh/neville/v1.0 and squashes the following commits:

0dc33ed [Neville Li] Fix spark-submit path in pyspark
becec64 [Neville Li] Fix spark-submit path in spark-shell
---
 bin/pyspark     | 2 +-
 bin/spark-shell | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/pyspark b/bin/pyspark
index 9e1364e44c..3908ffe799 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -27,7 +27,7 @@ SCALA_VERSION=2.10
 
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   echo "Usage: ./bin/pyspark [options]"
-  ./bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
+  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
   exit 0
 fi
 
diff --git a/bin/spark-shell b/bin/spark-shell
index c158683ab3..850e9507ec 100755
--- a/bin/spark-shell
+++ b/bin/spark-shell
@@ -28,15 +28,15 @@ esac
 # Enter posix mode for bash
 set -o posix
 
+## Global script variables
+FWDIR="$(cd `dirname $0`/..; pwd)"
+
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   echo "Usage: ./bin/spark-shell [options]"
-  ./bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
+  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
   exit 0
 fi
 
-## Global script variables
-FWDIR="$(cd `dirname $0`/..; pwd)"
-
 function main(){
     if $cygwin; then
         # Workaround for issue involving JLine and Cygwin
-- 
cgit v1.2.3