Compare commits

..

2 commits

Author SHA1 Message Date
538f7dc5a7
Fix makefile
- Background server process (hung otherwise)
- Execute `|| true` on the client; doesn't appear to work otherwise?
2026-02-12 16:35:04 -06:00
fcd1c22738
Remove /dist/ prefix from served files 2026-02-12 15:29:24 -06:00
2 changed files with 9 additions and 4 deletions

View file

@ -16,11 +16,11 @@ clean:
start: deploy start: deploy
# TODO: This doesn't kill weston nicely; I should handle that? Or background or something # TODO: This doesn't kill weston nicely; I should handle that? Or background or something
ssh kiosk "pgrep -f './server' || ./server" ssh kiosk "pgrep -f './server' || ./server &"
#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true" ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
ssh kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --remote-debugging-port=9222 ssh kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --remote-debugging-port=9222
debug: deploy debug: deploy
ssh kiosk "pgrep -f './server' || ./server" ssh kiosk "pgrep -f './server' || ./server &"
#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true" ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
ssh -L 6000:localhost:6000 kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --start-debugger-server 6000 ssh -L 6000:localhost:6000 kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --start-debugger-server 6000

View file

@ -3,6 +3,7 @@ package main
import ( import (
"embed" "embed"
"fmt" "fmt"
"io/fs"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -23,6 +24,10 @@ func setReader(state string) error {
func main() { func main() {
setReader("on") setReader("on")
webUI, err := fs.Sub(webUI, "dist")
if err != nil {
panic(err)
}
http.Handle("/", http.FileServerFS(webUI)) http.Handle("/", http.FileServerFS(webUI))
http.HandleFunc("POST /api/reader/{state}", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("POST /api/reader/{state}", func(w http.ResponseWriter, r *http.Request) {