luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bspStartTry

This commit is contained in:
Samuel CLARENC 2021-07-26 16:12:41 +02:00 committed by GitHub
parent 0be658d299 a0bb13cd66
commit e3f2371655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
View File

@ -342,7 +342,12 @@ class NetworkClient(
s"either upgrade $sbtScript to its latest version or make sure it is accessible from $$PATH, and run 'sbt bspConfig'" s"either upgrade $sbtScript to its latest version or make sure it is accessible from $$PATH, and run 'sbt bspConfig'"
) )
} }
List("java") ++ arguments.sbtArguments ++ val java = Option(Properties.javaHome)
.map { javaHome =>
s"$javaHome/bin/java"
}
.getOrElse("java")
List(java) ++ arguments.sbtArguments ++
List("-jar", lj, DashDashDetachStdio, DashDashServer) List("-jar", lj, DashDashDetachStdio, DashDashServer)
case _ => case _ =>
List(arguments.sbtScript) ++ arguments.sbtArguments ++ List(arguments.sbtScript) ++ arguments.sbtArguments ++