close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/go-contrib-init: fix get GOPATH env logic 

Go runtime now uses user homedir+go (i.e. $HOME/go) if GOPATH
environment variable is not set.

Change-Id: I26d90e07976a5311ea19de8a6e2c63830b802882
Reviewed-on: https://go-review.googlesource.com/46234
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Koichi Shiraishi 2017-06-21 13:53:24 +09:00 committed by Brad Fitzpatrick
parent 63c6481f3b
commit 601a54bfa3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/go-contrib-init/contrib.go
View File

@ -12,6 +12,7 @@ import (
"bytes" "bytes"
"flag" "flag"
"fmt" "fmt"
"go/build"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
@ -46,7 +47,7 @@ func detectrepo() string {
return "go" return "go"
} }
for _, path := range filepath.SplitList(os.Getenv("GOPATH")) { for _, path := range filepath.SplitList(build.Default.GOPATH) {
rightdir := filepath.Join(path, "src", "golang.org", "x") rightdir := filepath.Join(path, "src", "golang.org", "x")
if strings.HasPrefix(wd, rightdir) { if strings.HasPrefix(wd, rightdir) {
tail := wd[len(rightdir)+1:] tail := wd[len(rightdir)+1:]
@ -145,7 +146,7 @@ func checkWorkingDir() {
} }
func firstGoPath() string { func firstGoPath() string {
list := filepath.SplitList(os.Getenv("GOPATH")) list := filepath.SplitList(build.Default.GOPATH)
if len(list) < 1 { if len(list) < 1 {
return "" return ""
} }