From 6432e0c30d3605498582313bd8728e7b9cc5413b Mon Sep 17 00:00:00 2001 From: Kyle Ellrott Date: Sat, 8 Mar 2014 17:59:21 -0800 Subject: [PATCH 1/2] Adding code to execute rc file at start of spark-shell. Either defined via environmental variable SPARKSHELL_RC or by file at $HOME/.spark_shell_rc --- .../scala/org/apache/spark/repl/SparkILoop.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 9b1da195002c2..3eaaae9a6483b 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -910,6 +910,7 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, addThunk(printWelcome()) addThunk(initializeSpark()) + addThunk(runShellRC()) // it is broken on startup; go ahead and exit if (intp.reporter.hasErrors) @@ -958,6 +959,17 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, sparkContext } + def runShellRC() { + if (System.getenv("SPARKSHELL_RC") != null) { + loadCommand(System.getenv("SPARKSHELL_RC")) + } else { + val rc_file = File(System.getProperty("user.home"))/".spark_shell_rc" + if (rc_file.exists) { + loadCommand(rc_file.toString()) + } + } + } + private def getMaster(): String = { val master = this.master match { case Some(m) => m From 6a30cfdfe946017748620ae7fb89daa3a2dc5eae Mon Sep 17 00:00:00 2001 From: Kyle Ellrott Date: Sat, 8 Mar 2014 21:02:29 -0800 Subject: [PATCH 2/2] Changing SPARKSHELL_RC to SPARK_SHELL_RC --- repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 3eaaae9a6483b..6df3c4cbd8a2c 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -960,8 +960,8 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, } def runShellRC() { - if (System.getenv("SPARKSHELL_RC") != null) { - loadCommand(System.getenv("SPARKSHELL_RC")) + if (System.getenv("SPARK_SHELL_RC") != null) { + loadCommand(System.getenv("SPARK_SHELL_RC")) } else { val rc_file = File(System.getProperty("user.home"))/".spark_shell_rc" if (rc_file.exists) {