From 747bb1347e09d4bd6c86d24d452b569b9071622f Mon Sep 17 00:00:00 2001
From: Diana Carroll <dcarroll@cloudera.com>
Date: Thu, 27 Feb 2014 17:39:43 -0500
Subject: [PATCH] SPARK-1134 bug with ipython prevents non-interactive use with
 spark; only call ipython if no command line arguments were supplied

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

diff --git a/bin/pyspark b/bin/pyspark
index 67e1f61eeb1e5..cad982bc33477 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -55,7 +55,8 @@ if [ -n "$IPYTHON_OPTS" ]; then
   IPYTHON=1
 fi
 
-if [[ "$IPYTHON" = "1" ]] ; then
+# Only use ipython if no command line arguments were provided [SPARK-1134]
+if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
   exec ipython $IPYTHON_OPTS
 else
   exec "$PYSPARK_PYTHON" "$@"