Repository: spark Updated Branches: refs/heads/branch-1.0 f8e611955 -> e06e4b0af
Fix spark-submit path in spark-shell & pyspark Author: Neville Li <[email protected]> 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 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e06e4b0a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e06e4b0a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e06e4b0a Branch: refs/heads/branch-1.0 Commit: e06e4b0affc00bc15498313a36edbc9b7e2aaae2 Parents: f8e6119 Author: Neville Li <[email protected]> Authored: Sun May 18 13:31:23 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun May 18 13:31:23 2014 -0700 ---------------------------------------------------------------------- bin/pyspark | 2 +- bin/spark-shell | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e06e4b0a/bin/pyspark ---------------------------------------------------------------------- diff --git a/bin/pyspark b/bin/pyspark index 9e1364e..3908ffe 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 http://git-wip-us.apache.org/repos/asf/spark/blob/e06e4b0a/bin/spark-shell ---------------------------------------------------------------------- diff --git a/bin/spark-shell b/bin/spark-shell index c158683..850e950 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
