From 96e5a7957c830430f85b6b89d7bbe07824ebfc4b Mon Sep 17 00:00:00 2001
From: "Aaron D. Valade" <adv@alum.mit.edu>
Date: Mon, 19 Sep 2011 17:32:26 +0800
Subject: [PATCH] added parsing of a credentials file to add Ivy Credentials to
 the keyring

If the user sets the _sbt.boot.credentials_ system property or the
_SBT_CREDENTIALS_ environment variable, then that file gets parsed for a
realm, hostname, username and password which is added to the
CredentialsStore static instance.
---
 launch/ResolveValues.scala |  2 +-
 launch/Update.scala        | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/launch/ResolveValues.scala b/launch/ResolveValues.scala
index 98f84ad87..97d54cc1d 100644
--- a/launch/ResolveValues.scala
+++ b/launch/ResolveValues.scala
@@ -12,7 +12,7 @@ object ResolveValues
 	def apply(conf: LaunchConfiguration): LaunchConfiguration = (new ResolveValues(conf))()
 	private def trim(s: String) = if(s eq null) None else notEmpty(s.trim)
 	private def notEmpty(s: String) = if(isEmpty(s)) None else Some(s)
-	private def readProperties(propertiesFile: File) =
+	private[boot] def readProperties(propertiesFile: File) =
 	{
 		val properties = new Properties
 		if(propertiesFile.exists)
diff --git a/launch/Update.scala b/launch/Update.scala
index 832ac497c..ea48812ec 100644
--- a/launch/Update.scala
+++ b/launch/Update.scala
@@ -7,6 +7,7 @@ import Pre._
 import java.io.{File, FileWriter, PrintWriter, Writer}
 import java.util.concurrent.Callable
 import java.util.regex.Pattern
+import java.util.Properties
 
 import org.apache.ivy.{core, plugins, util, Ivy}
 import core.LogOptions
@@ -45,10 +46,19 @@ final class Update(config: UpdateConfiguration)
 
 	private def addCredentials()
 	{
-		val List(realm, host, user, password) = List("sbt.boot.realm", "sbt.boot.host", "sbt.boot.user", "sbt.boot.password") map System.getProperty
-		if(realm != null && host != null && user != null && password != null)
-			CredentialsStore.INSTANCE.addCredentials(realm, host, user, password)
+		val optionProps = 
+			Option(System.getProperty("sbt.boot.credentials")) orElse 
+			Option(System.getenv("SBT_CREDENTIALS")) map ( path =>
+				ResolveValues.readProperties(new File(path)) 
+			)
+		optionProps foreach extractCredentials("realm","host","user","password")
+		extractCredentials("sbt.boot.realm","sbt.boot.host","sbt.boot.user","sbt.boot.password")(System.getProperties)
 	}
+	private def extractCredentials(keys: (String,String,String,String))(props: Properties) {
+		val List(realm, host, user, password) = keys.productIterator.map(key => props.getProperty(key.toString)).toList
+		if (realm != null && host != null && user != null && password != null)
+			CredentialsStore.INSTANCE.addCredentials(realm, host, user, password)
+        }
 	private lazy val settings =
 	{
 		addCredentials()
@@ -359,4 +369,4 @@ private object SbtIvyLogger
 	val UnknownResolver = "unknown resolver"
 	def acceptError(msg: String) = acceptMessage(msg) && !msg.startsWith(UnknownResolver)
 	def acceptMessage(msg: String) = (msg ne null) && !msg.startsWith(IgnorePrefix)
-}
\ No newline at end of file
+}