From fe1325202b2029e9ee6e5957229a9453cb6919f4 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 30 Aug 2026 16:58:04 -0400 Subject: [PATCH] Default the acceptance suite's OMARCHY_PATH to the installed tree alone The suite verifies the finished product: VM runs never use a dev-linked tree, so the session-environment lookup and own-checkout fallback were needless indirection. /usr/share/omarchy is the default; a caller testing a different tree passes OMARCHY_PATH itself. --- test/acceptance | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/test/acceptance b/test/acceptance index 37a63f6e..ef2da6b0 100755 --- a/test/acceptance +++ b/test/acceptance @@ -19,21 +19,12 @@ mkdir -p "$OMARCHY_ACCEPTANCE_DIR" # the session environment is inherited. export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=$XDG_RUNTIME_DIR/bus}" -# The suite acts on the running session, and qs matches shell instances by -# config path — pointed at any other tree, every omarchy-shell call reads as -# "not running". So default OMARCHY_PATH to the tree the session was started -# from, then this checkout for standalone use, then the installed tree for -# when only test/ was synced in (omarchy-iso-test's --sync-omarchy). -if [[ -z ${OMARCHY_PATH:-} ]]; then - OMARCHY_PATH=$(systemctl --user show-environment 2>/dev/null | sed -n 's/^OMARCHY_PATH=//p' | tail -1) -fi -if [[ -z $OMARCHY_PATH ]]; then - OMARCHY_PATH=$ROOT -fi -if [[ ! -f $OMARCHY_PATH/shell/shell.qml && -f /usr/share/omarchy/shell/shell.qml ]]; then - OMARCHY_PATH=/usr/share/omarchy -fi -export OMARCHY_PATH +# The suite verifies the installed product the session is running, so default +# OMARCHY_PATH to the installed tree — never this checkout, which may hold +# only test/ (omarchy-iso-test's --sync-omarchy). qs matches shell instances +# by config path, so a suite pointed at any other tree reads the session +# shell as "not running". Callers testing a different tree pass it explicitly. +export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}" export PATH="$OMARCHY_PATH/bin:$PATH"