ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Default the acceptance suite's OMARCHY_PATH to the installed tree alone

Browse Source 
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.
This commit is contained in:
Ryan Hughes
2026-08-30 16:58:04 -04:00
parent 432b5e3e24
commit fe1325202b
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance
+6 -15
View File
@@ -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"