Fix make.ps1 client build for Windows

Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.

Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df
Component: engine
This commit is contained in:
John Stephens
2017-05-15 12:38:10 -07:00
parent 9322a3476f
commit 37a6b2b6e0
+1 -1
View File
@@ -411,7 +411,7 @@ Try {
$saveGOPATH = $env:GOPATH
Try {
$env:GOPATH = $tempLocation
$dockerCliRoot = "$env:GOPATH\src\$($dockerCliRepo.Split("/", 3)[2])"
$dockerCliRoot = "$env:GOPATH\src\github.com\docker\cli"
Write-Host "INFO: Cloning client repository..."
Invoke-Expression "git clone -q $dockerCliRepo $dockerCliRoot"
if ($LASTEXITCODE -ne 0) { Throw "Failed to clone client repository $dockerCliRepo" }