From 5ed012c7d9c21fa45aacf966f1cc574310d28312 Mon Sep 17 00:00:00 2001 From: Sanjin Sehic Date: Mon, 6 Feb 2012 18:03:37 +0100 Subject: [PATCH] Add another run method in Resolvers for commands with no working directory --- main/Resolvers.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/Resolvers.scala b/main/Resolvers.scala index 7c1366043..394cf5854 100644 --- a/main/Resolvers.scala +++ b/main/Resolvers.scala @@ -42,13 +42,13 @@ object Resolvers val revision = uri.getFragment Some { () => creates(localCopy) { - run(None, "svn", "checkout", "-r", revision, uri.toASCIIString, localCopy.getAbsolutePath) + run("svn", "checkout", "-r", revision, uri.toASCIIString, localCopy.getAbsolutePath) } } } else Some { () => creates(localCopy) { - run(None, "svn", "checkout", uri.toASCIIString, localCopy.getAbsolutePath) + run("svn", "checkout", uri.toASCIIString, localCopy.getAbsolutePath) } } } @@ -57,7 +57,7 @@ object Resolvers { override val scheme = "hg" - override def clone(at: String, into: File) = creates(into) {run(None, "hg", "clone", at, into.getAbsolutePath)} + override def clone(at: String, into: File) = creates(into) {run("hg", "clone", at, into.getAbsolutePath)} override def checkout(branch: String, in: File) { @@ -69,7 +69,7 @@ object Resolvers { override val scheme = "git" - override def clone(at: String, into: File) = creates(into) {run(None, "git", "clone", at, into.getAbsolutePath)} + override def clone(at: String, into: File) = creates(into) {run("git", "clone", at, into.getAbsolutePath)} override def checkout(branch: String, in: File) { @@ -113,6 +113,8 @@ object Resolvers isWindows && !isCygwin } + def run(command: String*) {run(None, command: _*)} + def run(cwd: Option[File], command: String*) { val result =