diff --git a/.gitignore b/.gitignore index 0a1df08..1edaee5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/server/assets_bundle.go +/server/assets.go /gofeed /_output /yarr diff --git a/makefile b/makefile index 264388b..de6c431 100644 --- a/makefile +++ b/makefile @@ -9,10 +9,10 @@ GO_LDFLAGS := $(GO_LDFLAGS) -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITH default: bundle -server/assets_bundle.go: $(ASSETS) +server/assets.go: $(ASSETS) go run scripts/bundle_assets.go >/dev/null -bundle: server/assets_bundle.go +bundle: server/assets.go build_macos: bundle set GOOS=darwin diff --git a/scripts/bundle_assets.go b/scripts/bundle_assets.go index f21af4f..fb9369c 100644 --- a/scripts/bundle_assets.go +++ b/scripts/bundle_assets.go @@ -92,5 +92,5 @@ func main() { var buf bytes.Buffer template := template.Must(template.New("code").Parse(code_template)) template.Execute(&buf, assets) - ioutil.WriteFile("server/assets_bundle.go", buf.Bytes(), 0644) + ioutil.WriteFile("server/assets.go", buf.Bytes(), 0644) }