From f51aad4b5b35ad0f5341a7a4fa94c1212dab235f Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Fri, 2 Mar 2012 00:59:06 +0530 Subject: [PATCH] Add fancier `shellPrompt` by default, also better arg names --- main/Opts.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main/Opts.scala b/main/Opts.scala index eb0396d67..e04ebfb4f 100644 --- a/main/Opts.scala +++ b/main/Opts.scala @@ -26,6 +26,7 @@ object DefaultOptions { import Opts._ import Path._ import BuildPaths.{getGlobalBase, getGlobalSettingsDirectory} + import Project.{Setting, extract} def javac: Seq[String] = compile.encoding("UTF-8") def scalac: Seq[String] = compile.encoding("UTF-8") @@ -34,6 +35,9 @@ object DefaultOptions { @deprecated("Use `credentials(State)` instead to make use of configuration path dynamically configured via `Keys.globalSettingsDirectory`; relying on ~/.ivy2 is not recommended anymore.", "0.12.0") def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials") - def credentials(s: State): Credentials = Credentials(getGlobalSettingsDirectory(s, getGlobalBase(s)) / ".credentials") - def addCredentials: Project.Setting[_] = Keys.credentials <+= Keys.state map credentials + def credentials(state: State): Credentials = Credentials(getGlobalSettingsDirectory(state, getGlobalBase(state)) / ".credentials") + def addCredentials: Setting[_] = Keys.credentials <+= Keys.state map credentials + + def shellPrompt(version: String): State => String = s => "%s:%s:%s> ".format(s.configuration.provider.id.name, extract(s).currentProject.id, version) + def setupShellPrompt: Setting[_] = Keys.shellPrompt <<= Keys.version apply shellPrompt }