From d496a5dff559a14d689a7138069164e764cec1ea Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 7 Mar 2019 16:49:54 -0500
Subject: [PATCH] Make showProgress configurable

---
 .../sbt/internal/util/ConsoleAppender.scala   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
index 50f6fb507..741bafc4f 100644
--- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
@@ -3,7 +3,7 @@ package sbt.internal.util
 import sbt.util._
 import java.io.{ PrintStream, PrintWriter }
 import java.util.Locale
-import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
 import org.apache.logging.log4j.{ Level => XLevel }
 import org.apache.logging.log4j.message.{ Message, ObjectMessage, ReusableObjectMessage }
 import org.apache.logging.log4j.core.{ LogEvent => XLogEvent }
@@ -105,6 +105,9 @@ object ConsoleAppender {
   private[this] val widthHolder: AtomicInteger = new AtomicInteger
   private[sbt] def terminalWidth = widthHolder.get
   private[sbt] def setTerminalWidth(n: Int): Unit = widthHolder.set(n)
+  private[this] val showProgressHolder: AtomicBoolean = new AtomicBoolean(false)
+  def setShowProgress(b: Boolean): Unit = showProgressHolder.set(b)
+  def showProgress: Boolean = showProgressHolder.get
 
   /** Hide stack trace altogether. */
   val noSuppressedMessage = (_: SuppressedTraceContext) => None
@@ -141,21 +144,6 @@ object ConsoleAppender {
     }
   }
 
-  /**
-   * Indicates whether the super shell is enabled.
-   */
-  lazy val showProgress: Boolean =
-    formatEnabledInEnv && sys.props
-      .get("sbt.progress")
-      .flatMap({ s =>
-        parseLogOption(s) match {
-          case LogOption.Always => Some(true)
-          case LogOption.Never  => Some(false)
-          case _                => None
-        }
-      })
-      .getOrElse(true)
-
   private[sbt] def parseLogOption(s: String): LogOption =
     s.toLowerCase match {
       case "always" => LogOption.Always