From becec64b6ca362b8b04111ea2d0bf6aa266b192f Mon Sep 17 00:00:00 2001
From: Neville Li <neville@spotify.com>
Date: Sat, 17 May 2014 21:01:49 +0000
Subject: [PATCH 1/2] Fix spark-submit path in spark-shell

---
 bin/spark-shell | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/spark-shell b/bin/spark-shell
index c158683ab3f9..850e9507ec38 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

From 0dc33edcf7a2da25efc8b509b5f8b37cdedcdec9 Mon Sep 17 00:00:00 2001
From: Neville Li <neville@spotify.com>
Date: Sun, 18 May 2014 09:40:45 -0400
Subject: [PATCH 2/2] Fix spark-submit path in pyspark

---
 bin/pyspark | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pyspark b/bin/pyspark
index 9e1364e44c8c..3908ffe79939 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