diff options
author | Tobias Roeser <le.petit.fou@web.de> | 2019-02-24 21:16:27 +0100 |
---|---|---|
committer | Tobias Roeser <le.petit.fou@web.de> | 2019-05-03 14:07:14 +0200 |
commit | 8a8f5ba21b21ac3aab3c3cea2937cbc31f9679a1 (patch) | |
tree | b210e30fd51bd59055bb6dbbc1a7719ccfef18d7 | |
parent | 18031fef5bc169e9b603a8867b0e2edeeeb87780 (diff) | |
download | mill-8a8f5ba21b21ac3aab3c3cea2937cbc31f9679a1.tar.gz mill-8a8f5ba21b21ac3aab3c3cea2937cbc31f9679a1.tar.bz2 mill-8a8f5ba21b21ac3aab3c3cea2937cbc31f9679a1.zip |
Don't initialize with all system properties
-rw-r--r-- | main/src/MillMain.scala | 12 |
1 files 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) { |