Know the runtime's OpenClaw by its own script

A service counted as the runtime's, or as a half-moved old one on /usr/bin/node, whenever it ran anything under ~/.openclaw, so a script of the user's in that directory could be stopped and rewritten, and seeding could go ahead beside it. The runtime is now OpenClaw's own script as upstream's installer lays it out, under ~/.openclaw/tools/*/lib/node_modules/openclaw, and both checks use that one definition.

Co-Authored-By: Codex XHigh <noreply@openai.com>
This commit is contained in:
Spencer BullandCodex XHigh committed 2026-09-28 00:52:56 -05:00
1 parent 72da1ec851
commit 9f0d4641bd
2 files changed
+29 -17

No files matched your search

+21 -15
View File
@@ -70,22 +70,29 @@ installed() {
omarchy-pkg-present openclaw && runtime_runs && on_path omarchy-pkg-present openclaw && runtime_runs && on_path
} }
# Whether a unit's ExecStart runs a program from under a path: the program # A unit's ExecStart, as the program and the script it is handed: the first
# itself, or the script it is handed. Later arguments and other lines can name # argument that is not an option. Later arguments and other lines can name
# ~/.openclaw whichever OpenClaw the unit starts. # ~/.openclaw whichever OpenClaw the unit starts.
unit_runs() { unit_program() {
local words
read -ra words <<<"$(sed -n 's/^ExecStart=//p' "$1" | head -1)"
echo "${words[0]:-}"
}
unit_script() {
local words word local words word
read -ra words <<<"$(sed -n 's/^ExecStart=//p' "$1" | head -1)" read -ra words <<<"$(sed -n 's/^ExecStart=//p' "$1" | head -1)"
if [[ ${words[0]:-} == "$2"* ]]; then
return 0
fi
for word in "${words[@]:1}"; do for word in "${words[@]:1}"; do
if [[ $word != -* ]]; then if [[ $word != -* ]]; then
[[ $word == "$2"* ]] echo "$word"
return return
fi fi
done done
return 1 }
# The runtime's own OpenClaw, as upstream's installer lays it out.
runs_runtime() {
[[ $(unit_script "$1") == "$prefix"/tools/*/lib/node_modules/openclaw/* ]]
} }
# A gateway service already running some other OpenClaw. Upstream's installer # A gateway service already running some other OpenClaw. Upstream's installer
@@ -94,7 +101,7 @@ unit_runs() {
foreign_gateway() { foreign_gateway() {
local unit local unit
unit=$(unit_path gateway) unit=$(unit_path gateway)
[[ -f $unit ]] && ! unit_runs "$unit" "$prefix/" && ! unit_runs "$unit" "/usr/lib/node_modules/openclaw/" [[ -f $unit ]] && ! runs_runtime "$unit" && ! on_old_package "$unit"
} }
# A service the openclaw package's own copy installed runs from # A service the openclaw package's own copy installed runs from
@@ -124,13 +131,12 @@ stop_legacy_services() {
# Still the old package's: its script, or the runtime's script on the old # Still the old package's: its script, or the runtime's script on the old
# package's Node. Upstream's installer keeps the Node a service already ran, so # package's Node. Upstream's installer keeps the Node a service already ran, so
# a moved unit can end up running ~/.openclaw on /usr/bin/node, from the nodejs # a moved unit can end up running the runtime's OpenClaw on /usr/bin/node, from
# package the seed no longer depends on. Any other Node or Bun is the user's. # the nodejs package the seed no longer depends on. Any other Node, Bun or
# script is the user's.
on_old_package() { on_old_package() {
local program [[ $(unit_script "$1") == /usr/lib/node_modules/openclaw/* ]] ||
program=$(sed -n 's/^ExecStart=//p' "$1" | head -1) { [[ $(unit_program "$1") == "/usr/bin/node" ]] && runs_runtime "$1"; }
program=${program%% *}
unit_runs "$1" "/usr/lib/node_modules/openclaw/" || { [[ $program == "/usr/bin/node" ]] && unit_runs "$1" "$prefix/"; }
} }
# Not moved yet: still on the old package, or running before and not now. # Not moved yet: still on the old package, or running before and not now.
+8 -2
View File
@@ -255,7 +255,7 @@ new_home half-moved
run omarchy-install-openclaw-cli --now || fail "--now sets OpenClaw up" "$(cat "$test_tmp/output")" run omarchy-install-openclaw-cli --now || fail "--now sets OpenClaw up" "$(cat "$test_tmp/output")"
mkdir -p "$test_home/.config/systemd/user" mkdir -p "$test_home/.config/systemd/user"
printf 'ExecStart=/usr/bin/node %s/.openclaw/tools/node-v24.19.0/lib/node_modules/openclaw/dist/index.js gateway --port 18789\n' "$test_home" >"$test_home/.config/systemd/user/openclaw-gateway.service" printf 'ExecStart=/usr/bin/node %s/.openclaw/tools/node-v24.19.0/lib/node_modules/openclaw/dist/index.js gateway --port 18789\n' "$test_home" >"$test_home/.config/systemd/user/openclaw-gateway.service"
printf 'ExecStart=/usr/bin/node /usr/lib/node_modules/openclaw/dist/index.js node run\n' >"$test_home/.config/systemd/user/openclaw-node.service" printf 'ExecStart=/usr/bin/node %s/.openclaw/tools/node-v24.19.0/lib/node_modules/openclaw/dist/index.js node run\n' "$test_home" >"$test_home/.config/systemd/user/openclaw-node.service"
touch "$test_home/active-openclaw-gateway.service" "$test_home/active-openclaw-node.service" touch "$test_home/active-openclaw-gateway.service" "$test_home/active-openclaw-node.service"
: >"$events" : >"$events"
run omarchy-install-openclaw-cli --now || fail "--now finishes a half-moved gateway" "$(cat "$test_tmp/output")" run omarchy-install-openclaw-cli --now || fail "--now finishes a half-moved gateway" "$(cat "$test_tmp/output")"
@@ -277,7 +277,13 @@ cp "$test_home/.config/systemd/user/openclaw-gateway.service" "$test_tmp/bun-uni
run omarchy-install-openclaw-cli --now || fail "--now leaves a Bun gateway alone" "$(cat "$test_tmp/output")" run omarchy-install-openclaw-cli --now || fail "--now leaves a Bun gateway alone" "$(cat "$test_tmp/output")"
! grep -q "install --force\|^systemctl" "$events" && cmp -s "$test_tmp/bun-unit" "$test_home/.config/systemd/user/openclaw-gateway.service" || ! grep -q "install --force\|^systemctl" "$events" && cmp -s "$test_tmp/bun-unit" "$test_home/.config/systemd/user/openclaw-gateway.service" ||
fail "--now leaves a Bun gateway alone" "$(cat "$events")" fail "--now leaves a Bun gateway alone" "$(cat "$events")"
pass "a gateway the user runs on Bun is left alone" printf 'ExecStart=/usr/bin/node %s/.openclaw/custom/bridge.js\n' "$test_home" >"$test_home/.config/systemd/user/openclaw-gateway.service"
cp "$test_home/.config/systemd/user/openclaw-gateway.service" "$test_tmp/own-unit"
: >"$events"
run omarchy-install-openclaw-cli --now || fail "--now leaves a script of the user's alone" "$(cat "$test_tmp/output")"
! grep -q "install --force\|^systemctl" "$events" && cmp -s "$test_tmp/own-unit" "$test_home/.config/systemd/user/openclaw-gateway.service" ||
fail "--now leaves a script of the user's alone" "$(cat "$events")"
pass "a gateway the user runs on Bun, or a script of their own on /usr/bin/node, is left alone"
# The migration moves only machines that have the package, and waits for the # The migration moves only machines that have the package, and waits for the
# package that seeds. # package that seeds.