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

Additional updates, should be clean now.

This commit is contained in:
Brian Topping 2014-09-17 15:24:33 -04:00
parent e81e8596b7
commit 7edf77bc28
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -5,7 +5,7 @@ package sbt
import java.io.File import java.io.File
import java.net.URL import java.net.URL
import scala.xml.{ XML, NodeSeq } import scala.xml.{ Text, NodeSeq, Elem, XML }
import org.apache.ivy.plugins.resolver.DependencyResolver import org.apache.ivy.plugins.resolver.DependencyResolver
sealed trait Resolver { sealed trait Resolver {
@ -303,17 +303,19 @@ object Resolver {
private[this] def mavenLocalDir: File = { private[this] def mavenLocalDir: File = {
def loadHomeFromSettings(f: () => File): Option[File] = def loadHomeFromSettings(f: () => File): Option[File] =
try { try {
XML.loadFile(f()) \ "settings" \ "localRepository" match { val file = XML.loadFile(f())
case scala.xml.Text(loc) => Some(new File(loc)) (file \ "localRepository").text match {
case _ => None case "" => None
case e @ _ => Some(new File(e))
} }
} catch { } catch {
case _: Throwable => None // Occurs inside File constructor when property or environment variable does not exist
case _: NullPointerException => None
} }
loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse
loadHomeFromSettings(() => new File(Path.fileProperty("M2_HOME"), "conf/settings.xml")) getOrElse loadHomeFromSettings(() => new File(new File(System.getenv("M2_HOME")), "conf/settings.xml")) getOrElse
new File(Path.userHome, ".m2/repository") new File(Path.userHome, ".m2/repository")
} }
def publishMavenLocal = Resolver.file("publish-m2-local", mavenLocalDir) def publishMavenLocal = Resolver.file("publish-m2-local", mavenLocalDir)
def mavenLocal = MavenRepository("Maven2 Local", mavenLocalDir.toURI.toString) def mavenLocal = MavenRepository("Maven2 Local", mavenLocalDir.toURI.toString)
def defaultLocal = defaultUserFileRepository("local") def defaultLocal = defaultUserFileRepository("local")