UltradesuandClaude Opus 4.8
f63343a6a0
Release / tsunagi-linux-aarch64 (push) Failing after 2m40s
Release / tsunagi-linux-x86_64 (push) Failing after 2m40s
Release / tsunagi-macos-aarch64 (push) Canceled after 0s
Release / tsunagi-windows-x86_64 (push) Canceled after 0s
Release / Publish release (push) Canceled after 0s
Adds the tray application to the release: - Every target's archive now also contains the tsunagi-tray binary. On Linux it is built against an old glibc baseline (via cargo-zigbuild) rather than static musl, because a GUI must dlopen libGL/X11/Wayland at runtime and a static musl binary cannot; the agent stays static musl. macOS and Windows build the tray natively. - New GUI package variants for Linux: `tsunagi-gui` .deb and .pkg.tar.zst, built by the existing scripts with an extra tray argument. They install the agent (service, polkit, user — same as the headless packages) plus the tray binary, a desktop launcher (dist/linux/tsunagi-tray.desktop) and an icon (dist/linux/tsunagi.svg), so the GUI appears in the applications menu. The GUI package conflicts/replaces/provides the headless tsunagi so the two do not coexist. - The tray finds the system service with no configuration: the library's default control-socket path now prefers /run/tsunagi/agent.sock when present (both the tray and CLI use this), falling back to the per-user path. No control-protocol change. Builds, fmt and clippy clean on macOS; the Linux GUI cross-build and the packages are exercised only by a real CI run. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
116 lines
4.1 KiB
Bash
Executable File
116 lines
4.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Assemble an Arch Linux package (.pkg.tar.zst) from prebuilt tsunagi binaries,
|
|
# using only bsdtar + zstd on a non-Arch host — no makepkg, no Arch container.
|
|
#
|
|
# Usage: build-pkg.sh <binary> <arch> <version> <output.pkg.tar.zst> [tray_binary]
|
|
# <binary> path to the built tsunagi (agent/CLI) executable
|
|
# <arch> pacman architecture: x86_64 or aarch64
|
|
# <version> package version (the tag without its leading v)
|
|
# <output> path to write the package to
|
|
# [tray_binary] optional tsunagi-tray GUI executable; when given, the package
|
|
# also installs the tray and a desktop launcher and is named
|
|
# tsunagi-gui (conflicting with the headless tsunagi).
|
|
#
|
|
# Needs bsdtar (libarchive-tools) and zstd on the builder.
|
|
set -euo pipefail
|
|
|
|
binary="$1"
|
|
arch="$2"
|
|
version="$3"
|
|
output="$4"
|
|
tray="${5:-}"
|
|
|
|
here="$(cd "$(dirname "$0")" && pwd)"
|
|
root="$(mktemp -d)"
|
|
trap 'rm -rf "$root"' EXIT
|
|
|
|
# pacman pkgver may not contain '-', so a prerelease tag like 0.1.0-rc.9 becomes
|
|
# 0.1.0_rc.9.
|
|
pkgver="$(printf '%s' "$version" | tr '-' '_')"
|
|
pkgrel=1
|
|
|
|
# Payload. Arch keeps units under /usr/lib/systemd/system and installs to
|
|
# /usr/bin, so the service's ExecStart is rewritten to match.
|
|
install -D -m 0755 "$binary" "$root/usr/bin/tsunagi"
|
|
|
|
mkdir -p "$root/usr/lib/systemd/system"
|
|
sed 's#/usr/local/bin/tsunagi#/usr/bin/tsunagi#' \
|
|
"$here/../linux/tsunagi.service" > "$root/usr/lib/systemd/system/tsunagi.service"
|
|
chmod 0644 "$root/usr/lib/systemd/system/tsunagi.service"
|
|
|
|
install -D -m 0644 "$here/../linux/50-tsunagi-resolved.rules" \
|
|
"$root/usr/share/polkit-1/rules.d/50-tsunagi-resolved.rules"
|
|
install -D -m 0644 "$here/../../README.md" "$root/usr/share/doc/tsunagi/README.md"
|
|
install -D -m 0644 "$here/../linux/README.md" "$root/usr/share/doc/tsunagi/INSTALL.md"
|
|
|
|
pkgname=tsunagi
|
|
pkgdesc="Serverless private mesh networking agent"
|
|
relations=""
|
|
if [ -n "$tray" ]; then
|
|
pkgname=tsunagi-gui
|
|
pkgdesc="Serverless private mesh networking agent, with the tray GUI"
|
|
relations=$'conflict = tsunagi\nprovides = tsunagi\nreplaces = tsunagi\n'
|
|
install -D -m 0755 "$tray" "$root/usr/bin/tsunagi-tray"
|
|
install -D -m 0644 "$here/../linux/tsunagi-tray.desktop" \
|
|
"$root/usr/share/applications/tsunagi-tray.desktop"
|
|
install -D -m 0644 "$here/../linux/tsunagi.svg" \
|
|
"$root/usr/share/icons/hicolor/scalable/apps/tsunagi.svg"
|
|
fi
|
|
|
|
# Installed size (payload only), before the metadata files are written.
|
|
size="$(du -sb "$root" | cut -f1)"
|
|
|
|
cat > "$root/.PKGINFO" <<PKGINFO
|
|
pkgname = ${pkgname}
|
|
pkgver = ${pkgver}-${pkgrel}
|
|
pkgdesc = ${pkgdesc}
|
|
url = https://github.com/Ultradesu/tsunagi
|
|
builddate = $(date +%s)
|
|
packager = AB <ab@hexor.cy>
|
|
size = ${size}
|
|
arch = ${arch}
|
|
${relations}license = MIT
|
|
license = Apache
|
|
PKGINFO
|
|
|
|
# Scriptlet: create the dedicated system user the service runs as, keep systemd
|
|
# in step, and refresh the desktop/icon caches (a no-op without a GUI payload).
|
|
cat > "$root/.INSTALL" <<'INSTALL'
|
|
post_install() {
|
|
getent group tsunagi >/dev/null 2>&1 || groupadd -r tsunagi
|
|
getent passwd tsunagi >/dev/null 2>&1 || \
|
|
useradd -r -g tsunagi -d /var/lib/tsunagi -s /usr/bin/nologin -c "tsunagi agent" tsunagi
|
|
systemctl daemon-reload >/dev/null 2>&1 || true
|
|
command -v update-desktop-database >/dev/null 2>&1 && \
|
|
update-desktop-database -q /usr/share/applications >/dev/null 2>&1 || true
|
|
command -v gtk-update-icon-cache >/dev/null 2>&1 && \
|
|
gtk-update-icon-cache -q -t /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
|
}
|
|
post_upgrade() {
|
|
post_install
|
|
}
|
|
pre_remove() {
|
|
systemctl disable --now tsunagi.service >/dev/null 2>&1 || true
|
|
}
|
|
post_remove() {
|
|
systemctl daemon-reload >/dev/null 2>&1 || true
|
|
}
|
|
INSTALL
|
|
|
|
# .MTREE over the metadata and payload (not over itself), gzip-compressed, as
|
|
# pacman expects.
|
|
(
|
|
cd "$root"
|
|
LANG=C bsdtar -czf .MTREE --format=mtree \
|
|
--options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
|
|
.PKGINFO .INSTALL usr
|
|
)
|
|
|
|
# Pack with .PKGINFO first, then the rest, and zstd-compress.
|
|
(
|
|
cd "$root"
|
|
bsdtar -cf - .PKGINFO .MTREE .INSTALL usr
|
|
) | zstd -c -19 -T0 > "$output"
|
|
|
|
echo "built $output"
|