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

Merge pull request #258 from jsuereth/windows-git-fix2 

Windows git fix
This commit is contained in:
Mark Harrah 2011-11-07 12:39:16 -08:00
parent 6f91f7b866 175f08e1e4
commit bef997fe29
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/Build.scala
View File

@ -87,10 +87,20 @@ object RetrieveUnit
}
}
def dropFragment(base: URI): URI = if(base.getFragment eq null) base else new URI(base.getScheme, base.getSchemeSpecificPart, null)
def gitClone(base: URI, tempDir: File): Unit =
run("git" :: "clone" :: dropFragment(base).toASCIIString :: tempDir.getAbsolutePath :: Nil, tempDir) ;
git("clone" :: dropFragment(base).toASCIIString :: tempDir.getAbsolutePath :: Nil, tempDir) ;
def gitCheckout(tempDir: File, branch: String): Unit =
run("git" :: "checkout" :: "-q" :: branch :: Nil, tempDir) ;
git("checkout" :: "-q" :: branch :: Nil, tempDir)
def git(args: List[String], cwd: File): Unit =
if(isWindowsShell) run(List("cmd", "/c", "git") ++ args, cwd)
else run("git" +: args, cwd)
lazy val isWindowsShell = {
val ostype = System.getenv("OSTYPE")
val isCygwin = ostype != null && ostype.toLowerCase.contains("cygwin")
val isWindows = System.getProperty("os.name", "").toLowerCase.contains("windows")
isWindows && !isCygwin
}
def run(command: List[String], cwd: File): Unit =
{
val result = Process(command, cwd) ! ;