diff --git a/makefile b/makefile index 4a8ca12..74c907d 100644 --- a/makefile +++ b/makefile @@ -5,6 +5,7 @@ GO_TAGS = sqlite_foreign_keys sqlite_json GO_LDFLAGS = -s -w -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)' GO_FLAGS = -tags "$(GO_TAGS)" -ldflags="$(GO_LDFLAGS)" +GO_FLAGS_DEBUG = -tags "$(GO_TAGS) debug" GO_FLAGS_GUI = -tags "$(GO_TAGS) gui" -ldflags="$(GO_LDFLAGS)" GO_FLAGS_GUI_WIN = -tags "$(GO_TAGS) gui" -ldflags="$(GO_LDFLAGS) -H windowsgui" @@ -75,7 +76,7 @@ windows_arm64_gui: src/platform/versioninfo.rc GOOS=windows GOARCH=arm64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/yarr.exe ./cmd/yarr serve: - go run $(GO_FLAGS) ./cmd/yarr -db local.db + go run $(GO_FLAGS_DEBUG) ./cmd/yarr -db local.db test: go test $(GO_FLAGS) ./... diff --git a/src/assets/assets.go b/src/assets/assets.go index d129b2c..9999e9a 100644 --- a/src/assets/assets.go +++ b/src/assets/assets.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "log" "os" + "fmt" ) type assetsfs struct { @@ -19,8 +20,10 @@ var FS assetsfs func (afs assetsfs) Open(name string) (fs.File, error) { if afs.embedded != nil { + fmt.Println("serving from embedded") return afs.embedded.Open(name) } + fmt.Println("serving local") return os.DirFS("src/assets").Open(name) } diff --git a/src/assets/assetsfs.go b/src/assets/assetsfs.go index 0ca62d4..a0acbad 100644 --- a/src/assets/assetsfs.go +++ b/src/assets/assetsfs.go @@ -1,3 +1,5 @@ +//go:build !debug + package assets import "embed" diff --git a/src/assets/index.html b/src/assets/index.html index 2ae35b1..1611f4d 100644 --- a/src/assets/index.html +++ b/src/assets/index.html @@ -24,21 +24,21 @@