diff --git a/flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala b/flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala index 797b420cd8b70..7751751a1cb60 100644 --- a/flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala +++ b/flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala @@ -26,4 +26,6 @@ class ILoopCompat( in0: Option[BufferedReader], out0: JPrintWriter) extends ILoop(in0, out0) { + + override def prompt = "Scala-Flink> " } diff --git a/flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala b/flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala index c1be6db99c099..1c395bb1e4145 100644 --- a/flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala +++ b/flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala @@ -21,11 +21,17 @@ package org.apache.flink.api.scala import java.io.BufferedReader import _root_.scala.tools.nsc.interpreter._ +import _root_.scala.io.AnsiColor.{MAGENTA, RESET} class ILoopCompat( in0: Option[BufferedReader], out0: JPrintWriter) extends ILoop(in0, out0) { + override def prompt = { + val promptStr = "Scala-Flink> " + s"$MAGENTA$promptStr$RESET" + } + protected def addThunk(f: => Unit): Unit = f } diff --git a/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala b/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala index a26ac2ecdc485..bcc9ef39df060 100644 --- a/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala +++ b/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala @@ -174,11 +174,6 @@ class FlinkILoop( jarFilePath } - /** - * CUSTOM START METHODS OVERRIDE: - */ - override def prompt = "Scala-Flink> " - /** * custom welcome message */ diff --git a/flink-staging/flink-scala-shell/start-script/start-scala-shell.sh b/flink-staging/flink-scala-shell/start-script/start-scala-shell.sh index 0af2a9df5c707..fd85897524e1d 100644 --- a/flink-staging/flink-scala-shell/start-script/start-scala-shell.sh +++ b/flink-staging/flink-scala-shell/start-script/start-scala-shell.sh @@ -77,9 +77,9 @@ done if ${EXTERNAL_LIB_FOUND} then - java -cp "$FLINK_CLASSPATH" org.apache.flink.api.scala.FlinkShell $@ --addclasspath "$EXT_CLASSPATH" + java -Dscala.color -cp "$FLINK_CLASSPATH" org.apache.flink.api.scala.FlinkShell $@ --addclasspath "$EXT_CLASSPATH" else - java -cp "$FLINK_CLASSPATH" org.apache.flink.api.scala.FlinkShell $@ + java -Dscala.color -cp "$FLINK_CLASSPATH" org.apache.flink.api.scala.FlinkShell $@ fi #restore echo