From 8a8f5ba21b21ac3aab3c3cea2937cbc31f9679a1 Mon Sep 17 00:00:00 2001
From: Tobias Roeser <le.petit.fou@web.de>
Date: Sun, 24 Feb 2019 21:16:27 +0100
Subject: Don't initialize with all system properties

---
 main/src/MillMain.scala | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/main/src/MillMain.scala b/main/src/MillMain.scala
index e6403e7f..ca4af87d 100644
--- a/main/src/MillMain.scala
+++ b/main/src/MillMain.scala
@@ -24,7 +24,7 @@ object MillMain {
       System.err,
       System.getenv().asScala.toMap,
       b => (),
-      System.getProperties().asScala.toMap
+      initialSystemProperties = Map()
     )
     System.exit(if (result) 0 else 1)
   }
@@ -135,6 +135,8 @@ object MillMain {
           stderr.println("Build repl needs to be run with the -i/--interactive flag")
           (false, stateCache)
         }else{
+          val systemProps = initialSystemProperties ++ extraSystemProperties
+
           val config =
             if(!repl) cliConfig
             else cliConfig.copy(
@@ -147,9 +149,9 @@ object MillMain {
                   |  repl.pprinter(),
                   |  build.millSelf.get,
                   |  build.millDiscover,
-                  |  $debugLog,
+                  |  debugLog = $debugLog,
                   |  keepGoing = $keepGoing,
-                  |  ${initialSystemProperties ++ extraSystemProperties}
+                  |  systemProperties = ${systemProps}
                   |)
                   |repl.pprinter() = replApplyHandler.pprinter
                   |import replApplyHandler.generatedEval._
@@ -165,9 +167,9 @@ object MillMain {
               stateCache,
               env,
               setIdle,
-              debugLog,
+              debugLog = debugLog,
               keepGoing = keepGoing,
-              initialSystemProperties ++ extraSystemProperties
+              systemProperties = systemProps
             )
 
             if (mill.main.client.Util.isJava9OrAbove) {
-- 
cgit v1.2.3