From e23757d46d28e05be30394f47c426b5c29cb4c2b Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 16 Aug 2020 09:18:52 -0600 Subject: [PATCH] remove dep --- Makefile | 13 +++---------- cmd/paste/main.go | 5 +++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 632ff61..656a6c5 100644 --- a/Makefile +++ b/Makefile @@ -22,16 +22,9 @@ clean: rm -rf $(BINARY) $(ROUTE_ASSET) $(DOCS_ASSET) setup: - dep ensure - go get github.com/jteeuwen/go-bindata/... - go get github.com/elazarl/go-bindata-assetfs/... git submodule update cd assets; npm i -ensure: - dep ensure -update - dep status - fmt: go fmt ./... @@ -49,12 +42,12 @@ $(ROUTE_ASSET): $(ROUTE_FILES) npm run build; \ cp -r build ../public - export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/src/routes" + go generate "sour.is/x/paste/src/routes" $(DOCS_ASSET): $(DOCS_FILES) $(SOURCE) echo "$$DUMMY_BINDATA" > src/docs/bindata.go - export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/cmd/paste" - export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/src/docs" + go generate "sour.is/x/paste/cmd/paste" + go generate "sour.is/x/paste/src/docs" deploy: $(SOURCE) $(ROUTE_ASSET) diff --git a/cmd/paste/main.go b/cmd/paste/main.go index e2d59ea..2fb0a92 100644 --- a/cmd/paste/main.go +++ b/cmd/paste/main.go @@ -29,11 +29,12 @@ package main // import "sour.is/x/paste/cmd/paste" import ( "os" "os/signal" + "syscall" + _ "sour.is/x/paste/src/docs" _ "sour.is/x/paste/src/routes" "sour.is/x/toolbox/httpsrv" "sour.is/x/toolbox/log" - "syscall" ) func main() { @@ -51,4 +52,4 @@ func main() { } } -//go:generate swagger generate spec -o ../../src/docs/public/swagger.json +//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger generate spec -o ../../src/docs/public/swagger.json