Introduce os.SubProcess.env DynamicVariable to override default env

build.sc

@@ -51,7 +51,8 @@ trait SafeDeps extends ScalaModule {
 }
 
 trait MiMaChecks extends Mima {
-  def mimaPreviousVersions = Seq("0.9.0", "0.9.1", "0.9.2", "0.9.3", "0.10.0")
+  def mimaPreviousVersions =
+    Seq("0.9.0", "0.9.1", "0.9.2", "0.9.3", "0.10.0", "0.10.1", "0.10.2", "0.10.3", "0.10.4")
   override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq(
     ProblemFilter.exclude[ReversedMissingMethodProblem]("os.PathConvertible.isCustomFs"),
     // this is fine, because ProcessLike is sealed (and its subclasses should be final)

os/src/ProcessOps.scala

@@ -486,17 +486,28 @@ private[os] object ProcessOps {
 
     val environment = builder.environment()
 
-    if (!propagateEnv) {
-      environment.clear()
-    }
-
-    if (env != null) {
-      for ((k, v) <- env) {
-        if (v != null) builder.environment().put(k, v)
-        else builder.environment().remove(k)
+    def addToProcessEnv(env: Map[String, String]) =
+      if (env != null) {
+        for ((k, v) <- env) {
+          if (v != null) environment.put(k, v)
+          else environment.remove(k)
+        }
       }
+
+    os.SubProcess.env.value match {
+      case null =>
+        if (!propagateEnv) {
+          environment.clear()
+        }
+      case subProcessEnvValue =>
+        environment.clear()
+        if (propagateEnv) {
+          addToProcessEnv(subProcessEnvValue)
+        }
     }
 
+    addToProcessEnv(env)
+
     builder.directory(Option(cwd).getOrElse(os.pwd).toIO)
 
     builder

os/src/SubProcess.scala

@@ -162,6 +162,12 @@ class SubProcess(
 
 object SubProcess {
 
+  /**
+   * The env passed by default to child processes.
+   * When `null`, the system environment is used.
+   */
+  val env = new scala.util.DynamicVariable[Map[String, String]](null)
+
   /**
    * A [[BufferedWriter]] with the underlying [[java.io.OutputStream]] exposed
    *

os/test/src/SubprocessTests.scala

@@ -146,6 +146,28 @@ object SubprocessTests extends TestSuite {
         }
       }
     }
+    test("envWithValue") {
+      if (Unix()) {
+        val variableName = "TEST_ENV_FOO"
+        val variableValue = "bar"
+        def envValue() = os.proc(
+          "bash",
+          "-c",
+          s"""if [ -z $${$variableName+x} ]; then echo "unset"; else echo "$$$variableName"; fi"""
+        ).call().out.lines().head
+
+        val before = envValue()
+        assert(before == "unset")
+
+        os.SubProcess.env.withValue(Map(variableName -> variableValue)) {
+          val res = envValue()
+          assert(res == variableValue)
+        }
+
+        val after = envValue()
+        assert(after == "unset")
+      }
+    }
     test("multiChunk") {
       // Make sure that in the case where multiple chunks are being read from
       // the subprocess in quick succession, we ensure that the output handler