Afonso OliveiraandClaude Fable 5.1
13a4306a8e
Three review findings on the update-hook boundary: The pre-refresh-pacman hook had been moved after the refresh transaction and, during a channel switch, deferred to the very end. That defeated the hook's purpose: custom repositories and IgnorePkg entries were not in place when the downgrade-capable -Syyuu ran. Run the hook where it used to run, after the package config is re-synced and before the transaction, but cold: revoke the timestamp, run it behind the no-update wrapper with the caller's original PATH, and revoke again before continuing. Every later privileged command authenticates with --no-update, so a detached child left by the hook has no reusable timestamp to wait for. Channel switching hands the caller's PATH to the refresh the same way the updater receives it, and no longer defers or re-runs the hook. Stay Awake was released before AUR builds, hooks and mise, so the machine could sleep during the longest part of an update. Releasing the inhibitor needs no privilege because the held command already dropped to the user, so stop it after mise and before the reboot prompt, as before. A packaged channel destination cannot be inspected before its package is installed, and a transaction can replace the running tree with a release that predates the command-scoped wrapper; from then on a bare sudo would resolve to /usr/bin/sudo and publish a timestamp, and the destination's own updater authenticates the same way. The switch used to abort only after the packages had changed, with generic rerun advice. Now it checks for the wrapper after each transaction before any further privileged step, completes what it safely can, and stops cold with instructions to run that release's update from a fresh session instead of launching it. Boundary tests pin the hook between the config copies and the transaction with a cold timestamp on both sides, the older-destination stop with its guidance and no launched updater, the new inhibitor position, and the post-update hook staying unreached on failures and signals. Docs, the manual and the sample hook describe the restored timing. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
109 lines
3.7 KiB
Bash
Executable File
109 lines
3.7 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
source "$SHELL_TEST_DIR/fixtures/sudo-boundary-test.sh"
|
|
copy_boundary_file bin/omarchy-update
|
|
test_tmp="$boundary_tmp"
|
|
stub_bin="$SUDO_TEST_ROOT/bin"
|
|
|
|
# Every step omarchy-update runs, recorded in order with the unattended flag it
|
|
# was handed. One of them can be told to fail.
|
|
steps=(
|
|
omarchy-update-lock
|
|
omarchy-update-requires-free-space
|
|
omarchy-update-confirm
|
|
omarchy-update-pkg-prune
|
|
omarchy-snapshot
|
|
omarchy-update-stay-awake
|
|
omarchy-update-dev
|
|
omarchy-update-keyring
|
|
omarchy-update-system-pkgs
|
|
omarchy-migrate
|
|
omarchy-hook
|
|
omarchy-update-aur-pkgs
|
|
omarchy-update-mise
|
|
omarchy-update-orphan-pkgs
|
|
omarchy-update-analyze-logs
|
|
omarchy-update-status
|
|
omarchy-update-restart
|
|
)
|
|
|
|
for step in "${steps[@]}"; do
|
|
rm -f "$stub_bin/$step"
|
|
cat >"$stub_bin/$step" <<'STUB'
|
|
#!/bin/bash
|
|
printf '%s unattended=%s\n' "${0##*/}" "${OMARCHY_UPDATE_UNATTENDED:-}" >>"$STEP_LOG"
|
|
[[ ${FAILING_STEP:-} != "${0##*/}" ]] || exit 1
|
|
STUB
|
|
chmod +x "$stub_bin/$step"
|
|
done
|
|
|
|
# OMARCHY_UPDATE_LOGGED stands in for the script(1) wrapper the update re-execs
|
|
# itself under; the stubbed lock reports itself already held.
|
|
run_update() {
|
|
: >"$test_tmp/steps"
|
|
STEP_LOG="$test_tmp/steps" \
|
|
FAILING_STEP="${FAILING_STEP:-}" \
|
|
OMARCHY_UPDATE_LOGGED=1 \
|
|
PATH="$stub_bin:$PATH" \
|
|
"$SUDO_TEST_ROOT/bin/omarchy-update" "$@" >"$test_tmp/out" 2>"$test_tmp/err"
|
|
}
|
|
|
|
steps_run() {
|
|
cut -d' ' -f1 "$test_tmp/steps"
|
|
}
|
|
|
|
# Every step of a whole update, in order. $1 asks for the one a person confirms.
|
|
# Stay Awake bookends the work, so it is here twice.
|
|
expected_steps() {
|
|
printf '%s\n' \
|
|
omarchy-update-lock \
|
|
omarchy-update-requires-free-space \
|
|
${1:+omarchy-update-confirm} \
|
|
omarchy-update-pkg-prune \
|
|
omarchy-snapshot \
|
|
omarchy-update-stay-awake \
|
|
omarchy-update-dev \
|
|
omarchy-update-keyring \
|
|
omarchy-update-system-pkgs \
|
|
omarchy-migrate \
|
|
omarchy-update-orphan-pkgs \
|
|
omarchy-update-analyze-logs \
|
|
omarchy-update-status \
|
|
omarchy-update-restart \
|
|
omarchy-update-aur-pkgs \
|
|
omarchy-hook \
|
|
omarchy-update-mise \
|
|
omarchy-update-stay-awake \
|
|
omarchy-update-restart
|
|
}
|
|
|
|
run_update -y || fail "an update where everything works reports a failure"
|
|
diff <(expected_steps) <(steps_run) >"$test_tmp/order" ||
|
|
fail "an update where everything works does not run every step in order" "$(cat "$test_tmp/order")"
|
|
pass "an update where every step works runs all of them, in order"
|
|
|
|
grep -q '^omarchy-update-system-pkgs unattended=1$' "$test_tmp/steps" ||
|
|
fail "-y does not mark the update unattended"
|
|
run_update </dev/null || fail "a confirmed update reports a failure"
|
|
diff <(expected_steps confirmed) <(steps_run) >"$test_tmp/order" ||
|
|
fail "a confirmed update runs a different set of steps" "$(cat "$test_tmp/order")"
|
|
grep -q '^omarchy-update-system-pkgs unattended=$' "$test_tmp/steps" ||
|
|
fail "an update a person confirmed is treated as unattended"
|
|
pass "-y is what marks an update unattended, not the update itself"
|
|
|
|
# Migrations ship with the packages the upgrade installs and are written against
|
|
# them. Running them against what is still on disk is the failure this ordering
|
|
# exists to prevent, so the update stops where the packages did.
|
|
if FAILING_STEP=omarchy-update-system-pkgs run_update -y; then
|
|
fail "an update whose packages did not upgrade passes for a whole one"
|
|
fi
|
|
for step in omarchy-migrate omarchy-hook omarchy-update-aur-pkgs omarchy-update-restart; do
|
|
if grep -q "^$step " "$test_tmp/steps"; then
|
|
fail "a blocked package upgrade still runs $step"
|
|
fi
|
|
done
|
|
pass "a blocked package upgrade stops the update before it migrates"
|