~emersion/drmdb

963275d7ecebae90bb0fd86467f5f77d0eb1dd2c — Simon Ser 1 year, 3 months ago 91e508f
Install templates and assets
3 files changed, 8 insertions(+), 2 deletions(-)

M Makefile
M server.go
M template.go
M Makefile => Makefile +4 -0
@@ 3,6 3,7 @@ GOFLAGS ?=
DESTDIR ?=
PREFIX ?= /usr/local
BINDIR ?= bin
DATADIR ?= share
LOCALSTATEDIR ?= /var

.PHONY: drmdb install


@@ 12,12 13,15 @@ all: drmdb
drmdb:
	$(GO) build $(GOFLAGS) \
		-ldflags="-X 'git.sr.ht/~emersion/drmdb/database.Dir=$(LOCALSTATEDIR)/lib/drmdb/db'" \
		-ldflags="-X 'git.sr.ht/~emersion/drmdb.PublicDir=$(PREFIX)/$(DATADIR)/drmdb/public'" \
		./cmd/drmdb

install:
	mkdir -p $(DESTDIR)$(PREFIX)/$(BINDIR)
	mkdir -p $(DESTDIR)$(PREFIX)/$(DATADIR)/drmdb
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/lib/drmdb
	cp -f drmdb $(DESTDIR)$(PREFIX)/$(BINDIR)
	cp -rf public/ $(DESTDIR)$(PREFIX)/$(DATADIR)/drmdb/public/

clean:
	rm -f drmdb

M server.go => server.go +3 -1
@@ 19,6 19,8 @@ import (
	"github.com/labstack/echo/v4"
)

var PublicDir = "public"

func badRequest(c echo.Context, msg string, err error) error {
	if err != nil {
		c.Logger().Printf("%v: %v", msg, err)


@@ 646,7 648,7 @@ func New() *echo.Echo {
		}{planeFilterPtr, driverFilter, planes, drivers, formats})
	})

	e.Static("/assets", "public/assets")
	e.Static("/assets", PublicDir+"/assets")

	e.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
		return func(ctx echo.Context) error {

M template.go => template.go +1 -1
@@ 46,7 46,7 @@ func loadTemplates() (*tmpl, error) {
			}
			return l
		},
	}).ParseGlob("public/*.html")
	}).ParseGlob(PublicDir + "/*.html")

	return &tmpl{t}, err
}