From 37a6b2b6e01a561d9d5b434c3574c7bd3a4f4c7f Mon Sep 17 00:00:00 2001 From: John Stephens Date: Mon, 15 May 2017 12:29:25 -0700 Subject: [PATCH] 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 Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df Component: engine --- components/engine/hack/make.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make.ps1 b/components/engine/hack/make.ps1 index 70b9853671..99df626674 100644 --- a/components/engine/hack/make.ps1 +++ b/components/engine/hack/make.ps1 @@ -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" }