diff --git a/.gitignore b/.gitignore index 98b6f1f..76297de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ journal.txt *~ -/bin/journal-server/assets.go /bin/journal-server/assets/.sass-cache /bin/journal-server/assets/css /journal-server diff --git a/bin/journal-server/assets.go b/bin/journal-server/assets.go new file mode 100644 index 0000000..128c04c --- /dev/null +++ b/bin/journal-server/assets.go @@ -0,0 +1,20 @@ +package main + +import ( + "embed" + "io" +) + +// embeddedAssets holds static web assets +//go:embed assets +var embeddedAssets embed.FS + +func Asset(name string) ([]byte, error) { + f, err := embeddedAssets.Open(name) + if err != nil { + return nil, err + } + defer f.Close() + + return io.ReadAll(f) +} diff --git a/build.sh b/build.sh index 63f95aa..a42ab43 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,10 @@ #!/bin/sh -# This script assumes you've run -# go get -u github.com/jteeuwen/go-bindata/... -# at least once. - cd bin/journal-server cd assets sass --update --style=compressed scss:css -cd .. -go generate -cd ../.. +cd ../../.. go build -o jrnl bin/jrnl/*.go -go build -o journal-server bin/journal-server/*.go +exec go build -o journal-server bin/journal-server/*.go diff --git a/dev-build.sh b/dev-build.sh deleted file mode 100755 index a6b8f93..0000000 --- a/dev-build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# This script assumes you've run -# go get -u github.com/jteeuwen/go-bindata/... -# at least once. - - -cd bin/journal-server -cd assets -sass --update --style=nested scss:css -cd .. -go-bindata -debug -o assets.go -pkg main assets/... -cd ../.. -