fix to use build.Default.GOPATH instead of os.Getenv(GOPATH)

kyoh86 · May 12, 2018 · d15c10c · d15c10c
1 parent acdda8a
commit d15c10c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/load.go b/config/load.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"go/build"
 	"io/ioutil"
 	"log"
 	"os"
@@ -38,7 +39,7 @@ func loadableSources() []string {
 
 	localOnly := os.Getenv(LocalOnlyEnvName)
 	if localOnly != "1" {
-		dirs = appendIndirect(dirs, getEnvPath("GOPATH"))
+		dirs = append(dirs, build.Default.GOPATH)
 		dirs = appendIndirect(dirs, getEnvPath("GOROOT"))
 		if xdgHome := xdg.ConfigHome(); xdgHome != "" {
 			dirs = append(dirs, xdgHome)

diff --git a/editor/test/test.go b/editor/test/test.go
@@ -2,6 +2,7 @@ package test
 
 import (
 	"fmt"
+	"go/build"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -63,7 +64,7 @@ func (e *test) Edit(line string) (string, error) {
 			Exp: importpath,
 			Func: func(s string) string {
 				s = strings.TrimPrefix(s, `# `)
-				imported := filepath.Join(os.Getenv(`GOPATH`), `src`, s)
+				imported := filepath.Join(build.Default.GOPATH, `src`, s)
 				stat, err := os.Stat(imported)
 				if err != nil {
 					return s