diff --git a/Gopkg.lock b/Gopkg.lock index 1a71dec5ee..6fe47b8cd1 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -13,6 +13,12 @@ revision = "17c858729c13fc4dae7ebb4f40212e1995fc59ac" version = "v1.2.0" +[[projects]] + name = "github.com/bmatcuk/doublestar" + packages = ["."] + revision = "b3608229437ba4dc33dae64d56a79a2a73f1f6b2" + version = "v1.0.9" + [[projects]] name = "github.com/briandowns/spinner" packages = ["."] @@ -49,15 +55,6 @@ revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" version = "v0.0.3" -[[projects]] - branch = "master" - name = "github.com/mattn/go-zglob" - packages = [ - ".", - "fastwalk" - ] - revision = "4959821b481786922ac53e7ef25c61ae19fb7c36" - [[projects]] branch = "master" name = "github.com/mitchellh/go-homedir" @@ -229,6 +226,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "385c35c78db3ea614977306c85503c32aba82868f5a3bd368a6c0e53385d8561" + inputs-digest = "1f48a131076a0899c4c0ac612a14959cfaf8c1ebdd5b9ef9a938959089d11f63" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index bac0b26d17..5dab9291c7 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -47,3 +47,11 @@ [[constraint]] branch = "v2" name = "gopkg.in/yaml.v2" + +[[constraint]] + name = "github.com/gobwas/glob" + version = "0.2.2" + +[[constraint]] + name = "github.com/bmatcuk/doublestar" + version = "1.0.9" diff --git a/Makefile b/Makefile index dcdbfc613a..0570ae698e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ endif .PHONY: default default: - GOBIN=${GOBIN} go install -ldflags '-race -X main.revision=$(shell git rev-parse HEAD)' github.com/fossas/fossa-cli/cmd/fossa + GOBIN=${GOBIN} go install -ldflags '-X main.revision=$(shell git rev-parse HEAD)' github.com/fossas/fossa-cli/cmd/fossa clean: rm -f $(GOPATH)/bin/fossa \ No newline at end of file diff --git a/build/commonjs.go b/build/commonjs.go index 26d06ca45a..740d0da461 100644 --- a/build/commonjs.go +++ b/build/commonjs.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/mattn/go-zglob" + "github.com/bmatcuk/doublestar" "github.com/fossas/fossa-cli/log" ) @@ -191,7 +191,7 @@ func (ctx *CommonJSContext) traverseNodeModules(m *Module) ([]Dependency, error) return nil, err } - commonjsPkgs, err := zglob.Glob(filepath.Join(cwd, m.Dir) + "/**/node_modules/*/package.json") + commonjsPkgs, err := doublestar.Glob(filepath.Join(cwd, m.Dir) + "/**/node_modules/*/package.json") if err != nil { return nil, err }