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

Merge pull request #5831 from eatkins/boot-fix 

Fix output when starting sbt from thin client
This commit is contained in:
eugene yokota 2020-09-10 17:25:09 -04:00 committed by GitHub
parent 1514f96492 1ec2cd85cd
commit 67f6df0bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -297,7 +297,7 @@ object Terminal {
// This approximates that both stdin and stdio are connected, // This approximates that both stdin and stdio are connected,
// so by default color will be turned off for pipes and redirects. // so by default color will be turned off for pipes and redirects.
val hasConsole = Option(java.lang.System.console).isDefined val hasConsole = Option(java.lang.System.console).isDefined
props.map(_.ansi).getOrElse(true) && hasConsole props.map(_.color).getOrElse(hasConsole)
} }
sys.props.get("sbt.log.noformat") match { sys.props.get("sbt.log.noformat") match {
case Some(_) => !java.lang.Boolean.getBoolean("sbt.log.noformat") case Some(_) => !java.lang.Boolean.getBoolean("sbt.log.noformat")
@ -852,8 +852,7 @@ object Terminal {
term.setEchoEnabled(true) term.setEchoEnabled(true)
} }
} }
override def isColorEnabled: Boolean = override def isColorEnabled: Boolean = props.map(_.color).getOrElse(formatEnabledInEnv)
props.map(_.color).getOrElse(ConsoleAppender.formatEnabledInEnv)
override def isSupershellEnabled: Boolean = override def isSupershellEnabled: Boolean =
props props

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

@ -1006,6 +1006,7 @@ object NetworkClient {
i += 1 i += 1
} }
val base = new File("").getCanonicalFile val base = new File("").getCanonicalFile
if (!sbtArguments.contains("-Dsbt.io.virtual=true")) sbtArguments += "-Dsbt.io.virtual=true"
new Arguments(base, sbtArguments, commandArgs, completionArguments, sbtScript) new Arguments(base, sbtArguments, commandArgs, completionArguments, sbtScript)
} }