Repository: spark Updated Branches: refs/heads/master 62a85eb09 -> a91784fb6
[SPARK-13973][PYSPARK] ipython notebook` is going away ## What changes were proposed in this pull request? https://issues.apache.org/jira/browse/SPARK-13973 ## How was this patch tested? Pyspark Author: Rekha Joshi <rekhajo...@gmail.com> Author: Joshi <rekhajo...@gmail.com> Closes #11829 from rekhajoshm/SPARK-13973. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a91784fb Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a91784fb Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a91784fb Branch: refs/heads/master Commit: a91784fb6e47e2f72551e2379731e0a36fda9d04 Parents: 62a85eb Author: Rekha Joshi <rekhajo...@gmail.com> Authored: Sat Mar 26 12:53:37 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Sat Mar 26 12:53:37 2016 +0000 ---------------------------------------------------------------------- bin/pyspark | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a91784fb/bin/pyspark ---------------------------------------------------------------------- diff --git a/bin/pyspark b/bin/pyspark index 6962f45..a257499 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -49,7 +49,11 @@ if [[ -n "$IPYTHON_OPTS" || "$IPYTHON" == "1" ]]; then # If IPython options are specified, assume user wants to run IPython # (for backwards-compatibility) PYSPARK_DRIVER_PYTHON_OPTS="$PYSPARK_DRIVER_PYTHON_OPTS $IPYTHON_OPTS" - PYSPARK_DRIVER_PYTHON="ipython" + if [ -x "$(command -v jupyter)" ]; then + PYSPARK_DRIVER_PYTHON="jupyter" + else + PYSPARK_DRIVER_PYTHON="ipython" + fi elif [[ -z "$PYSPARK_DRIVER_PYTHON" ]]; then PYSPARK_DRIVER_PYTHON="${PYSPARK_PYTHON:-"$DEFAULT_PYTHON"}" fi --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org