Fix cygwin problems. Handle @ and -color settings.

Author: BarkingBad

compiler/src/dotty/tools/MainGenericRunner.scala

@@ -72,7 +72,8 @@ object MainGenericRunner {
   val classpathSeparator = File.pathSeparator
 
   @sharable val javaOption = raw"""-J(.*)""".r
-
+  @sharable val scalaOption = raw"""@.*""".r
+  @sharable val colorOption = raw"""-color:.*""".r
   @tailrec
   def process(args: List[String], settings: Settings): Settings = args match
     case Nil =>
@@ -98,6 +99,10 @@ object MainGenericRunner {
       process(tail, settings.withSave)
     case (o @ javaOption(striped)) :: tail =>
       process(tail, settings.withJavaArgs(striped).withScalaArgs(o))
+    case (o @ scalaOption(_*)) :: tail =>
+      process(tail, settings.withScalaArgs(o))
+    case (o @ colorOption(_*)) :: tail =>
+      process(tail, settings.withScalaArgs(o))
     case arg :: tail =>
       val line = Try(Source.fromFile(arg).getLines.toList).toOption.flatMap(_.headOption)
       if arg.endsWith(".scala") || arg.endsWith(".sc") || (line.nonEmpty && raw"#!.*scala".r.matches(line.get)) then

compiler/src/dotty/tools/scripting/Main.scala

@@ -13,6 +13,8 @@ object Main:
     assert(rest.size >= 2, s"internal error: rest == Array(${rest.mkString(",")})")
 
     val file = File(rest(1))
+    // write script path to script.path property, so called script can see it
+    sys.props("script.path") = file.toPath.toAbsolutePath.toString
     val scriptArgs = rest.drop(2)
     var saveJar = false
     var invokeFlag = true // by default, script main method is invoked

compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala

@@ -52,6 +52,13 @@ class CoursierScalaTests:
       assertEquals(expectedOutput, output)
     scriptArgs()
 
+    def scriptPath() =
+      val scriptPath = scripts("/scripting").find(_.getName == "showArgs.sc").get.absPath
+      val args = scriptPath
+      val output = CoursierScalaTests.csCmd(args*)
+      assertTrue(output.startsWith("script.path:"))
+    scriptPath()
+
     def version() =
       val output = CoursierScalaTests.csCmd("-version")
       assertTrue(output.mkString("\n").contains(sys.env("DOTTY_BOOTSTRAPPED_VERSION")))

dist/bin/scala

@@ -30,6 +30,7 @@ source "$PROG_HOME/bin/common"
 
 # exec here would prevent onExit from being called, leaving terminal in unusable state
 compilerJavaClasspathArgs
+[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
 eval "\"$JAVACMD\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "$@"
 scala_exit_status=$?