Skip to content

Commit

Permalink
Merge pull request #155 from pwittrock/release-cmd
Browse files Browse the repository at this point in the history
Fix bug in release program that cleared the GOOS and GOARCH from the …
  • Loading branch information
Phillip Wittrock committed Sep 23, 2017
2 parents 9abb982 + d8ac253 commit 042dffa
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions cmd/apiserver-builder-release/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/spf13/cobra"
)

var targets = []string{}
var targets []string
var output string
var dovendor bool
var test bool
Expand Down Expand Up @@ -169,18 +169,17 @@ func RunCmd(cmd *exec.Cmd, gopath string) {
if err != nil {
log.Fatal(err)
}
cmd.Env = []string{}
if setgopath {
cmd.Env = append(cmd.Env, fmt.Sprintf("GOPATH=%s", gopath))
cmd.Env = append(cmd.Env, fmt.Sprintf("GOPATH=%s", gopath))
}
for _, v := range os.Environ() {
if strings.HasPrefix(v, "GOPATH=") && setgopath {
continue
}
cmd.Env = append(cmd.Env, v)
}
if strings.HasPrefix(v, "GOPATH=") && setgopath {
continue
}
cmd.Env = append(cmd.Env, v)
}

cmd.Stderr = os.Stderr
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
if len(cmd.Dir) == 0 && len(gopath) > 0 {
cmd.Dir = gopath
Expand Down

0 comments on commit 042dffa

Please sign in to comment.