summaryrefslogtreecommitdiff
path: root/main/src/main/MainRunner.scala
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-05-19 11:23:51 +0800
committerGitHub <noreply@github.com>2019-05-19 11:23:51 +0800
commit1cb439fce4af7a61166f13a3c5045fa7c73b25de (patch)
tree82f7d64e787e2871e973d895f20bfc0fe95df0f0 /main/src/main/MainRunner.scala
parent64f477e36c33afe8dfd87a839ba263e9973b0669 (diff)
parent052af24a530f8bc0532b368a2d360ff30f67d7b8 (diff)
downloadmill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.tar.gz
mill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.tar.bz2
mill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.zip
Merge branch 'master' into docker
Diffstat (limited to 'main/src/main/MainRunner.scala')
-rw-r--r--main/src/main/MainRunner.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/main/MainRunner.scala b/main/src/main/MainRunner.scala
index e08905a6..c773087c 100644
--- a/main/src/main/MainRunner.scala
+++ b/main/src/main/MainRunner.scala
@@ -25,7 +25,8 @@ class MainRunner(val config: ammonite.main.Cli.Config,
env : Map[String, String],
setIdle: Boolean => Unit,
debugLog: Boolean,
- keepGoing: Boolean)
+ keepGoing: Boolean,
+ systemProperties: Map[String, String])
extends ammonite.MainRunner(
config, outprintStream, errPrintStream,
stdIn, outprintStream, errPrintStream
@@ -85,7 +86,8 @@ class MainRunner(val config: ammonite.main.Cli.Config,
debugEnabled = debugLog
),
env,
- keepGoing = keepGoing
+ keepGoing = keepGoing,
+ systemProperties
)
result match{