From 60f56367dfc1e3c5095d034bed4fb4f572e32b55 Mon Sep 17 00:00:00 2001 From: Adam Malczewski Date: Wed, 27 May 2026 23:17:18 +0900 Subject: refactor(packaging): split into dispatch/dispatch-systemd/dispatch-s6, separate dispatch-electron, add bun-based frontend serve PKGBUILD is now a split package producing three .pkg.tar.zst files in one makepkg run: - dispatch base application files (/opt/dispatch), CLI wrappers (dispatch-api, dispatch-frontend), env configs (/etc/dispatch/dispatch-api.conf, /etc/dispatch/dispatch-frontend.conf) - dispatch-systemd systemd user units for dispatch-api + dispatch-frontend (conflicts with dispatch-s6) - dispatch-s6 s6-rc service pipelines (-srv + -log) for both services (conflicts with dispatch-systemd) The Electron desktop wrapper moved to its own self-contained PKGBUILD at packaging/electron/, producing dispatch-electron. It bundles its own copy of the frontend dist + electron entry points under /opt/dispatch-electron and does not depend on the base dispatch package, so users can install it standalone and point VITE_API_URL at any backend at build time. Files under packaging/ are now read directly from ${_projectdir}/packaging/ rather than via source=(); the two s6 service dirs share basenames (run, type) which would collide inside ${srcdir}. New frontend static server: packages/frontend/serve.ts uses Bun's built-in HTTP server (no extra runtime deps) with SPA fallback to index.html and path-traversal protection. PORT/HOST/DIST_DIR overridable via env. Exposed as 'bun run --cwd packages/frontend serve' and via /usr/bin/dispatch-frontend. Build scripts: - bin/build-pkg now prints the freshest built packages - bin/install-pkg installs dispatch + dispatch-systemd by default; accepts package names or --all; searches both packaging/ and packaging/electron/ - bin/build-pkg-electron new, builds the electron split - bin/build-pkg-windows replaces bin/windows-pkg; drops the hard-coded WSL copy step, just prints the win-unpacked path .gitignore extended to cover packaging/*.tar.zst and packaging/electron/{src,pkg,*.pkg.tar.zst,*.tar.zst}. --- bin/build-pkg | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'bin/build-pkg') diff --git a/bin/build-pkg b/bin/build-pkg index 904a0bb..d257efc 100755 --- a/bin/build-pkg +++ b/bin/build-pkg @@ -1,8 +1,23 @@ #!/usr/bin/env bash +# Build the dispatch Arch split package: dispatch + dispatch-systemd + dispatch-s6. +# One makepkg run produces three .pkg.tar.zst files in packaging/. +# +# Usage: +# bin/build-pkg # build +# bin/build-pkg --noconfirm # forward extra args to makepkg +# +# Override frontend build target with VITE_API_URL, e.g.: +# VITE_API_URL="https://api.example.com" bin/build-pkg + set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -PACKAGING_DIR="$(dirname "$SCRIPT_DIR")/packaging" +PROJECT_DIR="$(dirname "$SCRIPT_DIR")" +PACKAGING_DIR="$PROJECT_DIR/packaging" cd "$PACKAGING_DIR" makepkg -fd "$@" + +echo "" +echo "Built packages (newest first):" +ls -1t "$PACKAGING_DIR"/*.pkg.tar.zst 2>/dev/null | head -5 -- cgit v1.2.3