vendor/ needs to live in project root

Since the CLI imports gcw the vendor/ directory should live at the base of the repo. This also brings the project in line with most other go projects. Updated Makefile and gitignore to preserve functionality.
retr0h · Aug 9, 2018 · 5d68bd0 · 5d68bd0
1 parent 502a57a
commit 5d68bd0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-ghwc/vendor/
+vendor/*/
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ $(GOVENDOR):
 	go get -u github.com/kardianos/govendor
 
 ghwc/vendor/vendor.json: $(GOVENDOR)
-	cd ghwc; govendor sync
+	govendor sync
 
 $(GOMETALINTER):
 	go get -u github.com/alecthomas/gometalinter

diff --git a/ghwc/vendor/vendor.json → vendor/vendor.json b/ghwc/vendor/vendor.json → vendor/vendor.json
@@ -21,5 +21,5 @@
 			"revisionTime": "2017-05-08T18:43:26Z"
 		}
 	],
-	"rootPath": "github.com/jaypipes/ghw/ghwc"
+	"rootPath": "github.com/jaypipes/ghw"
 }