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

Merge pull request #5876 from eed3si9n/wip/bat 

sbt.cmd -> sbt.bat and --sbt-script update
This commit is contained in:
eugene yokota 2020-09-21 22:18:33 -04:00 committed by GitHub
parent 6e181ac843 b631dffed6
commit c2e81a23a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -985,7 +985,7 @@ object NetworkClient {
private[client] val noStdErr = "--no-stderr" private[client] val noStdErr = "--no-stderr"
private[client] val sbtBase = "--sbt-base-directory" private[client] val sbtBase = "--sbt-base-directory"
private[client] def parseArgs(args: Array[String]): Arguments = { private[client] def parseArgs(args: Array[String]): Arguments = {
var sbtScript = if (Properties.isWin) "sbt.cmd" else "sbt" var sbtScript = if (Properties.isWin) "sbt.bat" else "sbt"
val commandArgs = new mutable.ArrayBuffer[String] val commandArgs = new mutable.ArrayBuffer[String]
val sbtArguments = new mutable.ArrayBuffer[String] val sbtArguments = new mutable.ArrayBuffer[String]
val completionArguments = new mutable.ArrayBuffer[String] val completionArguments = new mutable.ArrayBuffer[String]
@ -1003,6 +1003,9 @@ object NetworkClient {
completionArguments += a completionArguments += a
case a if a.startsWith("--sbt-script=") => case a if a.startsWith("--sbt-script=") =>
sbtScript = a.split("--sbt-script=").lastOption.getOrElse(sbtScript) sbtScript = a.split("--sbt-script=").lastOption.getOrElse(sbtScript)
case "--sbt-script" if i + 1 < sanitized.length =>
i += 1
sbtScript = sanitized(i)
case a if !a.startsWith("-") => commandArgs += a case a if !a.startsWith("-") => commandArgs += a
case a @ SysProp(key, value) => case a @ SysProp(key, value) =>
System.setProperty(key, value) System.setProperty(key, value)