Replace go-bindata with go:embed

dokku · Mar 27, 2024 · 816c2f6 · 816c2f6
1 parent 819b9f4
commit 816c2f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 316 deletions.
diff --git a/Makefile b/Makefile
@@ -181,7 +181,6 @@ validate: test
 prebuild:
 	git config --global --add safe.directory $(shell pwd)
 	git status
-	cd / && go install github.com/go-bindata/go-bindata/...@latest
 	cd / && go install github.com/progrium/basht/...@latest
 
 test: prebuild docker-image

diff --git a/bindata.go b/bindata.go
diff --git a/plugn.go b/plugn.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"embed"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -15,6 +16,15 @@ import (
 var Version string
 var PluginPath string
 
+var (
+	//go:embed bashenv/*
+	fs embed.FS
+)
+
+func Asset(name string) ([]byte, error) {
+	return fs.ReadFile(filepath.ToSlash(name))
+}
+
 func assert(err error) {
 	if err != nil {
 		log.Fatal(err)