From bf9171d1ba35f03aa86af1a000669695e9821325 Mon Sep 17 00:00:00 2001
From: Jiuyang liu <liujiuyang1994@gmail.com>
Date: Sun, 13 Oct 2019 05:27:30 +0000
Subject: bug fix for system vended mill, no `MILL_CLASSPATH` avalible.

---
 contrib/bsp/src/mill/contrib/BSP.scala | 4 ++--
 1 file 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
+}
-- 
cgit v1.2.3