Modifying module name and usage

slicelife · Oct 7, 2021 · 45f3d27 · 45f3d27
1 parent 26949cc
commit 45f3d27
Show file tree

Hide file tree

Showing 44 changed files with 33 additions and 1,872 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
 ## bindata
-[![Build Status](https://cloud.drone.io/api/badges/go-bindata/go-bindata/status.svg)](https://cloud.drone.io/go-bindata/go-bindata)
-[![Go Report Card](https://goreportcard.com/badge/github.com/go-bindata/bindata)](https://goreportcard.com/report/github.com/go-bindata/bindata)
 
 This package converts any file into manageable Go source code. Useful for
 embedding binary data into a go program. The file data is optionally gzip
@@ -15,7 +13,7 @@ output being generated.
 
 To install the library and command line program, use the following:
 
-	go get -u github.com/go-bindata/go-bindata/...
+	go install github.com/slicelife/go-bindata@latest
 
 
 ### Usage

diff --git a/_config.yml b/_config.yml
diff --git a/go-bindata/AppendSliceValue.go → bindata/AppendSliceValue.go b/go-bindata/AppendSliceValue.go → bindata/AppendSliceValue.go
@@ -1,4 +1,4 @@
-package main
+package bindata
 
 import "strings"
 

diff --git a/asset.go → bindata/asset.go b/asset.go → bindata/asset.go
diff --git a/bytewriter.go → bindata/bytewriter.go b/bytewriter.go → bindata/bytewriter.go
diff --git a/config.go → bindata/config.go b/config.go → bindata/config.go
diff --git a/convert.go → bindata/convert.go b/convert.go → bindata/convert.go
diff --git a/convert_test.go → bindata/convert_test.go b/convert_test.go → bindata/convert_test.go
diff --git a/debug.go → bindata/debug.go b/debug.go → bindata/debug.go
diff --git a/doc.go → bindata/doc.go b/doc.go → bindata/doc.go
diff --git a/file.go → bindata/file.go b/file.go → bindata/file.go
diff --git a/release.go → bindata/release.go b/release.go → bindata/release.go
diff --git a/restore.go → bindata/restore.go b/restore.go → bindata/restore.go
diff --git a/stringwriter.go → bindata/stringwriter.go b/stringwriter.go → bindata/stringwriter.go
diff --git a/toc.go → bindata/toc.go b/toc.go → bindata/toc.go
diff --git a/go-bindata/version.go → bindata/version.go b/go-bindata/version.go → bindata/version.go
@@ -2,7 +2,7 @@
 // license. Its contents can be found at:
 // http://creativecommons.org/publicdomain/zero/1.0/
 
-package main
+package bindata
 
 import (
 	"fmt"

diff --git a/go-bindata/.gitignore b/go-bindata/.gitignore
diff --git a/go.mod b/go.mod
@@ -1,8 +1,11 @@
-module github.com/go-bindata/go-bindata/v3
+module github.com/slicelife/go-bindata
 
-go 1.12
+go 1.17
 
 require (
-	github.com/kisielk/errcheck v1.2.0
-	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
+	github.com/kisielk/errcheck v1.6.0
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
+	golang.org/x/mod v0.2.0 // indirect
+	golang.org/x/tools v0.0.0-20200619180055-7c47624df98f // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,13 +1,26 @@
-github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/errcheck v1.6.0 h1:YTDO4pNy7AUN/021p+JGHycQyYNIyMoenM1YDVK6RlY=
+github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f h1:kDxGY2VmgABOe55qheT/TFqUMtcTHnomIPS1iv3G4Ms=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f h1:tuwaIjfUa6eI6REiNueIxvNm1popyPUnqWga83S7U0o=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/go-bindata/main.go → main.go b/go-bindata/main.go → main.go
@@ -7,12 +7,11 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/slicelife/go-bindata/bindata"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
-
-	"github.com/go-bindata/go-bindata/v3"
 )
 
 func main() {
@@ -55,7 +54,7 @@ func parseArgs() *bindata.Config {
 	flag.BoolVar(&version, "version", false, "Displays version information.")
 
 	ignore := make([]string, 0)
-	flag.Var((*AppendSliceValue)(&ignore), "ignore", "Regex pattern to ignore")
+	flag.Var((*bindata.AppendSliceValue)(&ignore), "ignore", "Regex pattern to ignore")
 
 	flag.Parse()
 
@@ -66,7 +65,7 @@ func parseArgs() *bindata.Config {
 	c.Ignore = patterns
 
 	if version {
-		fmt.Printf("%s\n", Version())
+		fmt.Printf("%s\n", bindata.Version())
 		os.Exit(0)
 	}
 

diff --git a/testdata/Makefile b/testdata/Makefile
diff --git a/testdata/dupname/foo/bar b/testdata/dupname/foo/bar
diff --git a/testdata/dupname/foo_bar b/testdata/dupname/foo_bar
diff --git a/testdata/in/a/test.asset b/testdata/in/a/test.asset
diff --git a/testdata/in/b/test.asset b/testdata/in/b/test.asset
diff --git a/testdata/in/c/test.asset b/testdata/in/c/test.asset
diff --git a/testdata/in/test.asset b/testdata/in/test.asset