- check for errors when using the compilation d...

- check for errors when using the compilation daemon run scripts in
- package "$scalascript" instead of "scalascript"

1 files changed, 3 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index ba85dadd75..dad15d4960 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -126,7 +126,7 @@ object ScriptRunner {
   def wrappedScript(filename: String): SourceFile = {
     val preamble =
       new SourceFile("<script preamble>",
-          ("package scalascript\n" +
+          ("package $scalascript\n" +
           "object Main {\n" +
           "  def main(argv: Array[String]): Unit = {\n" +
           "  val args = argv;\n").toCharArray)
@@ -185,7 +185,7 @@ object ScriptRunner {
     var fromServer = in.readLine()
     while (fromServer != null) {
       System.out.println(fromServer)
-      if (fromServer.matches(".*errors? found.*"))
+      if (CompileSocket.errorPattern.matcher(fromServer).matches)
         compok = false
 
       fromServer = in.readLine()
@@ -296,7 +296,7 @@ object ScriptRunner {
       try {
         ObjectRunner.run(
           classpath,
-          "scalascript.Main",
+          "$scalascript.Main",
           scriptArgs.toArray)
       } catch {
         case e:InvocationTargetException =>