Merge pull request #444 from desbo/fix-backslash-escaping

Preserve backslashes in `expandMavenSettings`

core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala

@@ -3,13 +3,15 @@
  */
 package sbt.librarymanagement
 
-import java.io.{ IOException, File }
+import java.io.{ File, IOException }
 import java.net.{ URI, URL }
 import scala.annotation.nowarn
 import scala.xml.XML
 import org.xml.sax.SAXParseException
 import sbt.util.Logger
+
 import java.net.URI
+import scala.util.matching.Regex
 
 final class RawRepository(val resolver: AnyRef, name: String) extends Resolver(name) {
   override def toString = "Raw(" + resolver.toString + ")"
@@ -400,20 +402,29 @@ private[librarymanagement] abstract class ResolverFunctions {
   def defaultRetrievePattern =
     "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]"
   final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)"
-  private[librarymanagement] def expandMavenSettings(str: String): String = {
+
+  private[librarymanagement] def expandMavenSettings(
+      str: String,
+      envVars: Map[String, String] = sys.env,
+      props: Map[String, String] = sys.props.toMap
+  ): String = {
     // Aren't regular expressions beautifully clear and concise.
     // This means "find all ${...}" blocks, with the first group of each being the text between curly brackets.
-    val findQuoted = "\\$\\{([^\\}]*)\\}".r
+    val findQuoted = "\\$\\{([^}]*)}".r
     val env = "env\\.(.*)".r
 
     findQuoted.replaceAllIn(
       str,
-      _.group(1) match {
+      regexMatch =>
-        case env(variable) => sys.env.getOrElse(variable, "")
+        Regex.quoteReplacement {
-        case property      => sys.props.getOrElse(property, "")
+          regexMatch.group(1) match {
-      }
+            case env(variable) => envVars.getOrElse(variable, "")
+            case property      => props.getOrElse(property, "")
+          }
+        }
     )
   }
+
   private[this] def mavenLocalDir: File = {
     def loadHomeFromSettings(f: () => File): Option[File] =
       try {

core/src/test/scala/sbt/librarymanagement/ResolverExtraTest.scala

@@ -33,6 +33,13 @@ object ResolverExtraTest extends BasicTestSuite {
     )
   }
 
+  test("expandMavenSettings should preserve backslashes in environment variable values") {
+    val path = """C:\foo\bar\baz"""
+    val env = Map("SOME_PATH" -> path)
+
+    assert(Resolver.expandMavenSettings("${env.SOME_PATH}", env) == path)
+  }
+
   // - Helper functions ----------------------------------------------------------------------------
   // -----------------------------------------------------------------------------------------------
   def assertExpansion(input: String, expected: String) =