deprecated internal/envy.go now go modules mode only.

Author: sio4

go.mod

@@ -1,6 +1,6 @@
 module github.com/gobuffalo/packr/v2
 
-go 1.13
+go 1.16
 
 require (
 	github.com/gobuffalo/logger v1.0.6

go.sum

@@ -298,7 +298,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -477,7 +476,6 @@ golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

internal/envy.go

@@ -5,7 +5,6 @@ import (
 	"compress/gzip"
 	"crypto/md5"
 	"fmt"
-	"go/build"
 	"html/template"
 	"io"
 	"io/ioutil"
@@ -17,7 +16,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/gobuffalo/packr/v2/internal"
 	"github.com/karrick/godirwalk"
 
 	"github.com/gobuffalo/packr/v2/file/resolver/encoding/hex"
@@ -255,49 +253,34 @@ func (d *Disk) Close() error {
 	}
 
 	var ip string
-	if internal.Mods() {
-		// Starting in 1.12, we can rely on Go's method for
-		// resolving where go.mod resides. Prior versions will
-		// simply return an empty string.
-		cmd := exec.Command("go", "env", "GOMOD")
-		out, err := cmd.Output()
-		if err != nil {
-			return fmt.Errorf("go.mod cannot be read or does not exist while go module is enabled")
-		}
-		mp := strings.TrimSpace(string(out))
-		if mp == "" {
-			// We are on a prior version of Go; try and do
-			// the resolution ourselves.
-			mp = filepath.Join(filepath.Dir(d.DBPath), "go.mod")
-			if _, err := os.Stat(mp); err != nil {
-				mp = filepath.Join(d.DBPath, "go.mod")
-			}
-		}
-
-		moddata, err := ioutil.ReadFile(mp)
-		if err != nil {
-			return fmt.Errorf("go.mod cannot be read or does not exist while go module is enabled")
-		}
-		ip = modfile.ModulePath(moddata)
-		if ip == "" {
-			return fmt.Errorf("go.mod is malformed")
-		}
-		ip = filepath.Join(ip, strings.TrimPrefix(filepath.Dir(d.DBPath), filepath.Dir(mp)))
-		ip = strings.Replace(ip, "\\", "/", -1)
-	} else {
-		ip = filepath.Dir(d.DBPath)
-		srcs := internal.GoPaths()
-		srcs = append(srcs, build.Default.SrcDirs()...)
-		for _, x := range srcs {
-			ip = strings.TrimPrefix(ip, "/private")
-			ip = strings.TrimPrefix(ip, x)
+	// Starting in 1.12, we can rely on Go's method for
+	// resolving where go.mod resides. Prior versions will
+	// simply return an empty string.
+	cmd := exec.Command("go", "env", "GOMOD")
+	out, err := cmd.Output()
+	if err != nil {
+		return fmt.Errorf("go.mod cannot be read or does not exist while go module is enabled")
+	}
+	mp := strings.TrimSpace(string(out))
+	if mp == "" {
+		// We are on a prior version of Go; try and do
+		// the resolution ourselves.
+		mp = filepath.Join(filepath.Dir(d.DBPath), "go.mod")
+		if _, err := os.Stat(mp); err != nil {
+			mp = filepath.Join(d.DBPath, "go.mod")
 		}
-		ip = strings.TrimPrefix(ip, string(filepath.Separator))
-		ip = strings.TrimPrefix(ip, "src")
-		ip = strings.TrimPrefix(ip, string(filepath.Separator))
+	}
 
-		ip = strings.Replace(ip, "\\", "/", -1)
+	moddata, err := ioutil.ReadFile(mp)
+	if err != nil {
+		return fmt.Errorf("go.mod cannot be read or does not exist while go module is enabled")
+	}
+	ip = modfile.ModulePath(moddata)
+	if ip == "" {
+		return fmt.Errorf("go.mod is malformed")
 	}
+	ip = filepath.Join(ip, strings.TrimPrefix(filepath.Dir(d.DBPath), filepath.Dir(mp)))
+	ip = strings.Replace(ip, "\\", "/", -1)
 	ip = path.Join(ip, d.DBPackage)
 
 	for _, n := range opts.Boxes {