mirror of https://github.com/sbt/sbt.git
Add -P option to force display of progress bars...
...else also look at the COURSIER_PROGRESS env var to force enabling or disabling them. This deprecates the COURSIER_NO_TERM env var.
This commit is contained in:
parent
0f0c245c77
commit
05d8224c49
|
|
@ -56,10 +56,17 @@ object Terminal {
|
|||
}
|
||||
|
||||
object TermDisplay {
|
||||
private def defaultFallbackMode: Boolean = {
|
||||
val env = sys.env.get("COURSIER_NO_TERM").nonEmpty
|
||||
def defaultFallbackMode: Boolean = {
|
||||
val env0 = sys.env.get("COURSIER_PROGRESS").map(_.toLowerCase).collect {
|
||||
case "true" | "enable" | "1" => true
|
||||
case "false" | "disable" | "0" => false
|
||||
}
|
||||
def compatibilityEnv = sys.env.get("COURSIER_NO_TERM").nonEmpty
|
||||
|
||||
def nonInteractive = System.console() == null
|
||||
|
||||
val env = env0.getOrElse(compatibilityEnv)
|
||||
|
||||
env || nonInteractive
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -201,9 +201,15 @@ class Helper(
|
|||
filter = Some(dep => keepOptional || !dep.optional)
|
||||
)
|
||||
|
||||
val loggerFallbackMode =
|
||||
!progress && TermDisplay.defaultFallbackMode
|
||||
|
||||
val logger =
|
||||
if (verbosityLevel >= 0)
|
||||
Some(new TermDisplay(new OutputStreamWriter(System.err)))
|
||||
Some(new TermDisplay(
|
||||
new OutputStreamWriter(System.err),
|
||||
fallbackMode = loggerFallbackMode
|
||||
))
|
||||
else
|
||||
None
|
||||
|
||||
|
|
@ -333,7 +339,10 @@ class Helper(
|
|||
|
||||
val logger =
|
||||
if (verbosityLevel >= 0)
|
||||
Some(new TermDisplay(new OutputStreamWriter(System.err)))
|
||||
Some(new TermDisplay(
|
||||
new OutputStreamWriter(System.err),
|
||||
fallbackMode = loggerFallbackMode
|
||||
))
|
||||
else
|
||||
None
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ case class CommonOptions(
|
|||
@Help("Increase verbosity (specify several times to increase more)")
|
||||
@Short("v")
|
||||
verbose: Int @@ Counter,
|
||||
@Help("Force display of progress bars")
|
||||
@Short("P")
|
||||
progress: Boolean,
|
||||
@Help("Maximum number of resolution iterations (specify a negative value for unlimited, default: 100)")
|
||||
@Short("N")
|
||||
maxIterations: Int = 100,
|
||||
|
|
@ -163,7 +166,7 @@ case class BootstrapOptions(
|
|||
mainClass: String,
|
||||
@Short("o")
|
||||
output: String = "bootstrap",
|
||||
@Short("D")
|
||||
@Short("d")
|
||||
downloadDir: String,
|
||||
@Short("f")
|
||||
force: Boolean,
|
||||
|
|
@ -172,7 +175,7 @@ case class BootstrapOptions(
|
|||
standalone: Boolean,
|
||||
@Help("Set Java properties in the generated launcher.")
|
||||
@Value("key=value")
|
||||
@Short("P")
|
||||
@Short("D")
|
||||
property: List[String],
|
||||
@Help("Set Java command-line options in the generated launcher.")
|
||||
@Value("option")
|
||||
|
|
|
|||
Loading…
Reference in New Issue