summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiuyang liu <liujiuyang1994@gmail.com>2019-10-13 05:27:30 +0000
committerJiuyang liu <liujiuyang1994@gmail.com>2019-10-13 06:09:32 +0000
commitbf9171d1ba35f03aa86af1a000669695e9821325 (patch)
treefae31384fad81b74eb8dba2d0af78f5fb76ba5c4
parent5f6da18596a0544c0270af8cf11478024220eab2 (diff)
downloadmill-bf9171d1ba35f03aa86af1a000669695e9821325.tar.gz
mill-bf9171d1ba35f03aa86af1a000669695e9821325.tar.bz2
mill-bf9171d1ba35f03aa86af1a000669695e9821325.zip
bug fix for system vended mill, no `MILL_CLASSPATH` avalible.
-rw-r--r--contrib/bsp/src/mill/contrib/BSP.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala
index 5334f509..d928f4c2 100644
--- a/contrib/bsp/src/mill/contrib/BSP.scala
+++ b/contrib/bsp/src/mill/contrib/BSP.scala
@@ -69,7 +69,7 @@ object BSP extends ExternalModule {
// creates a Json with the BSP connection details
def createBspConnectionJson(): String = {
- val millPath = scala.sys.props("MILL_CLASSPATH")
+ val millPath = scala.sys.props.get("MILL_CLASSPATH").getOrElse(scala.sys.process.Process("which mill").lineStream_!.mkString)
write(BspConfigJson("mill-bsp",
List(whichJava,
"-DMILL_CLASSPATH=" + millPath,
@@ -133,4 +133,4 @@ object BSP extends ExternalModule {
executor.shutdown()
}
}
-} \ No newline at end of file
+}