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

Merge pull request #4836 from eed3si9n/wip/runarg 

quote run argument if it contains a whitespace
This commit is contained in:
eugene yokota 2019-07-08 07:06:08 -04:00 committed by GitHub
parent 0a54d8facc f0f55c38a5
commit fd87c34cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
run/src/main/scala/sbt/Run.scala
View File

@ -47,7 +47,7 @@ class ForkRun(config: ForkOptions) extends ScalaRun {
} }
def fork(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Process = { def fork(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Process = {
log.info("Running (fork) " + mainClass + " " + options.mkString(" ")) log.info(s"running (fork) $mainClass ${Run.runOptionsStr(options)}")
val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
val configLogged = val configLogged =
@ -65,7 +65,7 @@ class Run(newLoader: Seq[File] => ClassLoader, trapExit: Boolean) extends ScalaR
/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/ /** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
def run(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Try[Unit] = { def run(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Try[Unit] = {
log.info("Running " + mainClass + " " + options.mkString(" ")) log.info(s"running $mainClass ${Run.runOptionsStr(options)}")
def execute() = def execute() =
try { try {
@ -159,4 +159,12 @@ object Run {
Success(()) Success(())
} else Failure(new MessageOnlyException("Nonzero exit code: " + exitCode)) } else Failure(new MessageOnlyException("Nonzero exit code: " + exitCode))
} }
// quotes the option that includes a whitespace
// https://github.com/sbt/sbt/issues/4834
private[sbt] def runOptionsStr(options: Seq[String]): String =
(options map {
case str if str.contains(" ") => "\"" + str + "\""
case str => str
}).mkString(" ")
} }