From b4d6b775c70f54ccd38951a94af3540a9425bbfa Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 26 Jul 2026 19:02:15 -0700
Subject: [PATCH] Point the Snapper test at paths that still exist

Its setup check grepped omarchy-setup-system for config/snapper.sh, which
the config phase has run since the install was split into phases.

The omarchy-pkgs and omarchy-iso lookups also missed the sibling checkout
layout that f375113f taught config-test about, so they failed on machines
where config-test passed. Both now take an explicit path override.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 test/shell.d/snapper-test.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/shell.d/snapper-test.sh b/test/shell.d/snapper-test.sh
index 2730543a..68bcee04 100644
--- a/test/shell.d/snapper-test.sh
+++ b/test/shell.d/snapper-test.sh
@@ -72,7 +72,10 @@ grep -Fx 'systemctl enable --now snapper-cleanup.timer limine-snapper-sync.servi
 pass "snapshot configure normalizes Snapper policy and services"
 
 setup_system="$ROOT/bin/omarchy-setup-system"
-grep -F 'config/snapper.sh' "$setup_system" >/dev/null
+grep -F 'config/all.sh' "$setup_system" >/dev/null ||
+  fail "system setup runs the config phase"
+grep -F 'config/snapper.sh' "$ROOT/install/config/all.sh" >/dev/null ||
+  fail "config phase normalizes Snapper"
 pass "system setup normalizes Snapper during fresh installs"
 
 migration=$(grep -rl 'Normalize Snapper snapshot services' "$ROOT/migrations" | head -n 1 || true)
@@ -84,12 +87,18 @@ grep -F 'as_root env OMARCHY_PATH="$OMARCHY_PATH" bash -euo pipefail "$snapper_c
 ! grep -F 'NUMBER_LIMIT="5"' "$migration" >/dev/null || fail "Snapper service migration does not overwrite working custom retention"
 pass "Snapper service migration only repairs broken services idempotently"
 
+# Checkouts differ per machine, so allow an explicit pointer at the sibling repo.
+# Accepts either the omarchy-pkgs checkout or its pkgbuilds/ directory.
 find_omarchy_pks_root() {
   local candidate
   for candidate in \
+    ${OMARCHY_PKGS_PATH:+"$OMARCHY_PKGS_PATH/pkgbuilds" "$OMARCHY_PKGS_PATH"} \
     "$ROOT/../omarchy-pkgs/pkgbuilds" \
     "$ROOT/../omarchy/omarchy-pkgs/pkgbuilds" \
-    "$ROOT/../../omarchy-pkgs/pkgbuilds"; do
+    "$ROOT/../../omarchy-pkgs/pkgbuilds" \
+    "$ROOT/../omacom/omarchy-pkgs/pkgbuilds" \
+    "$ROOT/../../omacom/omarchy-pkgs/pkgbuilds" \
+    "$HOME/Work/omacom/omarchy-pkgs/pkgbuilds"; do
     if [[ -d $candidate ]]; then
       cd "$candidate" && pwd
       return 0
@@ -111,12 +120,17 @@ grep -F 'cp -a install "$pkgdir/usr/share/omarchy/"' "$omarchy_pkgbuild" >/dev/n
 grep -F 'cp -a migrations "$pkgdir/usr/share/omarchy/"' "$omarchy_pkgbuild" >/dev/null || fail "omarchy package bundles migrations"
 pass "omarchy-pkgs packages Snapper template, setup, and migration coverage"
 
+# Same per-machine checkout problem as omarchy-pkgs; OMARCHY_ISO_PATH points at it.
 find_omarchy_iso_root() {
   local candidate
   for candidate in \
+    ${OMARCHY_ISO_PATH:+"$OMARCHY_ISO_PATH"} \
     "$ROOT/../omarchy-iso" \
     "$ROOT/../omarchy/omarchy-iso" \
-    "$ROOT/../../omarchy-iso"; do
+    "$ROOT/../../omarchy-iso" \
+    "$ROOT/../omacom/omarchy-iso" \
+    "$ROOT/../../omacom/omarchy-iso" \
+    "$HOME/Work/omacom/omarchy-iso"; do
     if [[ -d $candidate ]]; then
       cd "$candidate" && pwd
       return 0