Skip to content

Commit fe13252

Browse files
committed
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.
1 parent 432b5e3 commit fe13252

1 file changed

Lines changed: 6 additions & 15 deletions

File tree

‎test/acceptance‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,12 @@ mkdir -p "$OMARCHY_ACCEPTANCE_DIR"
1919
# the session environment is inherited.
2020
export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
2121
export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=$XDG_RUNTIME_DIR/bus}"
22-
# The suite acts on the running session, and qs matches shell instances by
23-
# config path — pointed at any other tree, every omarchy-shell call reads as
24-
# "not running". So default OMARCHY_PATH to the tree the session was started
25-
# from, then this checkout for standalone use, then the installed tree for
26-
# when only test/ was synced in (omarchy-iso-test's --sync-omarchy).
27-
if [[ -z ${OMARCHY_PATH:-} ]]; then
28-
OMARCHY_PATH=$(systemctl --user show-environment 2>/dev/null | sed -n 's/^OMARCHY_PATH=//p' | tail -1)
29-
fi
30-
if [[ -z $OMARCHY_PATH ]]; then
31-
OMARCHY_PATH=$ROOT
32-
fi
33-
if [[ ! -f $OMARCHY_PATH/shell/shell.qml && -f /usr/share/omarchy/shell/shell.qml ]]; then
34-
OMARCHY_PATH=/usr/share/omarchy
35-
fi
36-
export OMARCHY_PATH
22+
# The suite verifies the installed product the session is running, so default
23+
# OMARCHY_PATH to the installed tree — never this checkout, which may hold
24+
# only test/ (omarchy-iso-test's --sync-omarchy). qs matches shell instances
25+
# by config path, so a suite pointed at any other tree reads the session
26+
# shell as "not running". Callers testing a different tree pass it explicitly.
27+
export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
3728

3829
export PATH="$OMARCHY_PATH/bin:$PATH"
3930

0 commit comments

Comments
 (0)