remove mount/ package references and ollie-watchdog

- mount/ package no longer exists, remove from build/test rules
- remove ollie-watchdog script (unused)
- keep ollie-remount (still needed for FUSE recovery)
This commit is contained in:
Levi Neely 2026-08-04 16:58:44 +02:00
parent 05517c384a
commit abdc91d097
2 changed files with 5 additions and 22 deletions

View File

@ -1,16 +0,0 @@
#!/bin/sh
# ollie-watchdog — ensure ollie FUSE mount stays healthy.
# Handles initial mount and recovery from stale mounts.
set -e
INTERVAL="${OLLIE_WATCHDOG_INTERVAL:-10}"
NAMESPACE="${NAMESPACE:-/tmp/ns.$(id -un).$(echo "${DISPLAY:-:0}" | tr / _)}"
SOCK="$NAMESPACE/ollie"
while true; do
if [ -S "$SOCK" ] && ! ollie-9p read help >/dev/null 2>&1; then
logger -t ollie-watchdog "mount unhealthy, remounting"
ollie-remount 2>/dev/null || true
fi
sleep "$INTERVAL"
done

View File

@ -28,7 +28,7 @@ build-kf5: core ninep lib9p ollie-remote kde-kf5
core:
@echo === Building ollie-core ===
go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/... ./log/... ./mount/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/lsp/... ./toolsrv/...
go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/... ./log/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/lsp/... ./toolsrv/...
ninep:
@echo === Building ollie-9p ===
@ -176,10 +176,9 @@ install-data:
install -m644 data/tools/_lib/__init__.py {{cfg}}/tools/_lib/__init__.py
install -m644 data/tools/_lib/args.py {{cfg}}/tools/_lib/args.py
install -m755 data/tools/_lib/args.sh {{cfg}}/tools/_lib/args.sh
# Scripts (ollie-remount, ollie-watchdog, logseq-cli)
# Scripts (ollie-remount, logseq-cli, o)
mkdir -p {{bin}}
install -m755 data/scripts/ollie-remount {{bin}}/ollie-remount
install -m755 data/scripts/ollie-watchdog {{bin}}/ollie-watchdog
install -m755 data/scripts/logseq-cli {{bin}}/logseq-cli
install -m755 data/scripts/o {{bin}}/o
@ -198,7 +197,7 @@ install-systemd:
uninstall:
@echo === Uninstalling ollie ===
rm -f {{bin}}/Ollie {{bin}}/Kmpl {{bin}}/Oi {{bin}}/Theo
rm -f {{bin}}/ollie-remount {{bin}}/ollie-watchdog {{bin}}/o
rm -f {{bin}}/ollie-remount {{bin}}/o
rm -f {{bin}}/prompt {{bin}}/ollieread {{bin}}/sendctl {{bin}}/ollie-ls
rm -rf {{cfg}}
# Service files
@ -215,7 +214,7 @@ uninstall:
uninstall-kf5:
@echo '=== Uninstalling ollie (KF5) ==='
rm -f {{bin}}/Ollie {{bin}}/Kmpl {{bin}}/Oi {{bin}}/Theo
rm -f {{bin}}/ollie-remount {{bin}}/ollie-watchdog {{bin}}/o
rm -f {{bin}}/ollie-remount {{bin}}/o
rm -f {{bin}}/prompt {{bin}}/ollieread {{bin}}/sendctl {{bin}}/ollie-ls
rm -rf {{cfg}}
# Service files
@ -239,7 +238,7 @@ test-core:
test-9p:
@echo === Testing ollie-9p ===
go test ./fs/... ./mount/...
go test ./fs/...
test-remote:
@echo === Testing ollie-remote ===