Use vfsgen instead of go-bindata (#7080)

* use vfsgen instead of go-bindata

* fix templates

* fix fmt

* vendor vsfgen

3 files changed, 25 insertions, 11 deletions

diff --git a/modules/public/main.go b/modules/public/main.go
new file mode 100644
index 0000000000..707dbe2b22
--- /dev/null
+++ b/modules/public/main.go
@@ -0,0 +1,23 @@
+// +build ignore
+
+package main
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/shurcooL/vfsgen"
+)
+
+func main() {
+	var fsPublic http.FileSystem = http.Dir("../../public")
+	err := vfsgen.Generate(fsPublic, vfsgen.Options{
+		PackageName:  "public",
+		BuildTags:    "bindata",
+		VariableName: "Assets",
+		Filename:     "bindata.go",
+	})
+	if err != nil {
+		log.Fatal("%v", err)
+	}
+}
diff --git a/modules/public/public.go b/modules/public/public.go
index 2e004536f8..8362b42576 100644
--- a/modules/public/public.go
+++ b/modules/public/public.go
@@ -17,10 +17,8 @@ import (
 	"gopkg.in/macaron.v1"
 )
 
-//go:generate go-bindata -tags "bindata" -ignore "\\.go|\\.less" -pkg "public" -o "bindata.go" ../../public/...
+//go:generate go run -mod=vendor main.go
 //go:generate go fmt bindata.go
-//go:generate sed -i.bak s/..\/..\/public\/// bindata.go
-//go:generate rm -f bindata.go.bak
 
 // Options represents the available options to configure the macaron handler.
 type Options struct {
diff --git a/modules/public/static.go b/modules/public/static.go
index 10e32dbd10..054b9a806c 100644
--- a/modules/public/static.go
+++ b/modules/public/static.go
@@ -7,19 +7,12 @@
 package public
 
 import (
-	"github.com/go-macaron/bindata"
 	"gopkg.in/macaron.v1"
 )
 
 // Static implements the macaron static handler for serving assets.
 func Static(opts *Options) macaron.Handler {
-	opts.FileSystem = bindata.Static(bindata.Options{
-		Asset:      Asset,
-		AssetDir:   AssetDir,
-		AssetInfo:  AssetInfo,
-		AssetNames: AssetNames,
-		Prefix:     "",
-	})
+	opts.FileSystem = Assets
 	// we don't need to pass the directory, because the directory var is only
 	// used when in the options there is no FileSystem.
 	return opts.staticHandler("")