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

cmd/go-contrib-init: better GOPATH checkout error message 

Modify the error message to provide more context if the user is in the
wrong directory. (The default Terminal.app does not do a great job of
showing what directory you are currently in).

Change-Id: Iafcbbd2070ca968863120fb8c4bc15609475cda2
Reviewed-on: https://go-review.googlesource.com/48232
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Kevin Burke 2017-07-12 21:43:35 -06:00
parent 7a94893dc3
commit 6f1996fdfe
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,16 +147,20 @@ func checkGoroot() {
}
func checkWorkingDir() {
if *repo == "go" {
if inGoPath() {
log.Fatal("You can't work on Go from within your GOPATH. Please checkout Go outside of your GOPATH")
}
return
}
wd, err := os.Getwd()
if err != nil {
log.Fatal(err)
}
if *repo == "go" {
if inGoPath(wd) {
log.Fatalf(`You can't work on Go from within your GOPATH. Please checkout Go outside of your GOPATH
Current directory: %s
GOPATH: %s
`, wd, os.Getenv("GOPATH"))
}
return
}
gopath := firstGoPath()
if gopath == "" {
@ -197,12 +201,7 @@ func exists(path string) (bool, error) {
return true, err
}
func inGoPath() bool {
wd, err := os.Getwd()
if err != nil {
log.Fatal(err)
}
func inGoPath(wd string) bool {
if os.Getenv("GOPATH") == "" {
return false
}