commit - d84207cf6f8a5a2222e9dafec2bd548aab5276e2
commit + 8d819406d7a0b6260ad8fd9433562a701de987e8
blob - c6cc80ceda7964ad32c64531341ac64943aedbf9
blob + 777780537ecce15ae6a7250069c230cb88695a75
--- README
+++ README
ssh://got.fugu.farm/fugu_agent.git
-The OpenBSD development checkout is normally `/home/isaac/fugu2`.
+The OpenBSD development checkout is normally `/home/isaac/fugu`.
Clone it with an explicit destination when creating that checkout:
- git clone ssh://got.fugu.farm/fugu_agent.git /home/isaac/fugu2
+ git clone ssh://got.fugu.farm/fugu_agent.git /home/isaac/fugu
The current port version is 0.3. The `v0.1` tag preserves the previous
canonical release state.
blob - 1d4cf3462691dd6aa23db4d88835ac20c31b1846
blob + da7a636f413daa37ad766b186a121ad2c9e29a87
--- docs/adr/0006-typed-imsg-exchanges.md
+++ docs/adr/0006-typed-imsg-exchanges.md
## Considered options
- *Transplant fugu1's arbitrary-length logical-message reassembly.* Rejected:
- fugu2 deliberately processes several bounded payloads incrementally and has
+ fugu deliberately processes several bounded payloads incrementally and has
a different hub topology. The useful lesson is centralized checked framing
and sequence ownership, not the old wire format.
- *One Module aware of every `FUGU_IMSG` type.* Rejected: its Interface would
blob - c6f964010afd0dda8561527770472213679fd99b
blob + 877b78a69b1f00d8cd909188f77d5329a9363d8a
--- docs/openbsd-development.md
+++ docs/openbsd-development.md
# OpenBSD development and local package installation
This is the canonical procedure for building and installing fugu from the
-OpenBSD checkout at `/home/isaac/fugu2`. It keeps source verification separate
+OpenBSD checkout at `/home/isaac/fugu`. It keeps source verification separate
from package verification: `make check` is the hermetic source gate, while the
ports framework creates and installs the package that exercises `_fugu`, file
ownership, modes, manuals, and the sample configuration.
There are three distinct locations in the normal workflow:
-- `/home/isaac/org/tech/coding/fugu2` is the authoring checkout on the local
+- `/home/isaac/org/tech/coding/fugu` is the authoring checkout on the local
workstation;
- `ssh://got.fugu.farm/fugu_agent.git` is the canonical Git repository and the
exchange point between hosts;
-- `/home/isaac/fugu2` is a separate checkout on the OpenBSD host reached through
+- `/home/isaac/fugu` is a separate checkout on the OpenBSD host reached through
the SSH alias `server`; that host builds and installs the package.
The two working directories are independent Git clones. A commit in the
push it to the canonical repository:
```sh
-cd /home/isaac/org/tech/coding/fugu2
+cd /home/isaac/org/tech/coding/fugu
git status --short --branch
git branch --show-current
git push origin main
```sh
ssh-add -l
-cd /home/isaac/fugu2
+cd /home/isaac/fugu
git fetch --prune origin
git status --short --branch
git switch main
On OpenBSD, use BSD make:
```sh
-cd /home/isaac/fugu2
+cd /home/isaac/fugu
make check
```
Materialize the current clean commit as a checksummed local port:
```sh
-cd /home/isaac/fugu2
+cd /home/isaac/fugu
make local-port
```
## Deploy the package on the server
All commands from distfile creation through installation run on `server` from
-its `/home/isaac/fugu2` checkout. Install a newly built package through the
+its `/home/isaac/fugu` checkout. Install a newly built package through the
ports framework:
```sh
force a package-level reinstall:
```sh
-cd /home/isaac/fugu2
+cd /home/isaac/fugu
make local-port
make -C /usr/ports/mystuff/productivity/fugu clean=all
make -C /usr/ports/mystuff/productivity/fugu package
checks:
```sh
-cd /home/isaac/fugu2
+cd /home/isaac/fugu
git rev-parse HEAD
git rev-parse origin/main
pkg_info -e 'fugu-*'
blob - e3919e0b11d446cb31914f4073adba21fa721712
blob + 74f0039dd4d99a6b6c2813e16b78c91b059e3b3c
--- scripts/rmake
+++ scripts/rmake
set -eu
host=server
-rdir=fugu2
+rdir=fugu
src=$(cd "$(dirname "$0")/.." && pwd)
rsync -a --delete --exclude .git --exclude 'obj/' "$src"/ "$host:$rdir/"