David Heinemeier HanssonandClaude Opus 5
03902f2460
The retired omarchy-update-user-notify.path stays loaded in sessions that started before the update removing it, and pacman writes the migrations directory mid-transaction, so it fired a critical toast for migrations that omarchy-migrate was about to apply a step later. Migration 1785095882 stops that watcher, but migrations run after pacman, so it lands 11 seconds too late to prevent the toast it exists to retire. Check the lock omarchy-update holds for its whole pipeline instead of trusting that no trigger exists. That covers the stale watcher and anything added later: during an update every pending migration is by definition already being applied. The check repeats after waiting for the notification server, which is long enough for an update to start underneath it. Only this user's runtime directory is read, never the /tmp path the updater falls back to without XDG_RUNTIME_DIR. A shared lock file belongs to whoever created it first, so honouring it would let one user silence another user's notification; a redundant toast is the better failure. The sleep inhibitor now starts with the lock descriptor closed. It outlives the step that starts it, so an update killed before restore_update_inhibitors left it holding the flock indefinitely. That already blocked later updates, and now that the notifier reads the same lock it would have silenced migration notices at every login. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
112 lines
3.1 KiB
Bash
Executable File
112 lines
3.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Update Omarchy and system packages
|
|
# omarchy:args=[-y]
|
|
# omarchy:examples=omarchy update | omarchy update -y
|
|
# omarchy:requires-sudo=true
|
|
|
|
set -e
|
|
|
|
if [[ -z ${OMARCHY_UPDATE_LOGGED:-} ]]; then
|
|
script_command=$(printf '%q ' "$0" "$@")
|
|
exec env OMARCHY_UPDATE_LOGGED=1 script -qefc "$script_command" "/tmp/omarchy-update.log"
|
|
fi
|
|
|
|
acquire_update_lock() {
|
|
local lock_dir="${XDG_RUNTIME_DIR:-/tmp}"
|
|
local lock_path="$lock_dir/omarchy-update.lock"
|
|
local lock_fd_path=""
|
|
|
|
mkdir -p "$lock_dir" 2>/dev/null || true
|
|
|
|
if [[ -n ${OMARCHY_UPDATE_LOCK_FD:-} && -e /proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD ]]; then
|
|
lock_fd_path=$(readlink -f "/proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD" 2>/dev/null || true)
|
|
if [[ $lock_fd_path == "$(readlink -m "$lock_path")" ]] && flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
exec {OMARCHY_UPDATE_LOCK_FD}>"$lock_path"
|
|
if ! flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
|
|
echo "An Omarchy update is already running."
|
|
exit 1
|
|
fi
|
|
export OMARCHY_UPDATE_LOCK_FD
|
|
}
|
|
|
|
update_disabled_idle=0
|
|
sleep_inhibit_pid=""
|
|
|
|
disable_sleep_for_update() {
|
|
omarchy-cmd-present systemd-inhibit || return 0
|
|
|
|
systemd-inhibit \
|
|
--what=sleep:idle \
|
|
--who=omarchy-update \
|
|
--why="Omarchy update in progress" \
|
|
--mode=block \
|
|
sleep infinity >/dev/null 2>&1 {OMARCHY_UPDATE_LOCK_FD}>&- &
|
|
sleep_inhibit_pid=$!
|
|
}
|
|
|
|
disable_idle_for_update() {
|
|
local stay_awake_state="$HOME/.local/state/omarchy/indicators/stay-awake"
|
|
|
|
if [[ ! -f $stay_awake_state ]]; then
|
|
omarchy-toggle-idle stay-awake >/dev/null 2>&1 || true
|
|
update_disabled_idle=1
|
|
fi
|
|
}
|
|
|
|
restore_update_inhibitors() {
|
|
if (( update_disabled_idle )); then
|
|
omarchy-toggle-idle allow-idle >/dev/null 2>&1 || true
|
|
fi
|
|
|
|
if [[ -n $sleep_inhibit_pid ]]; then
|
|
kill "$sleep_inhibit_pid" >/dev/null 2>&1 || true
|
|
wait "$sleep_inhibit_pid" >/dev/null 2>&1 || true
|
|
fi
|
|
}
|
|
|
|
run_update_pipeline() {
|
|
disable_sleep_for_update
|
|
disable_idle_for_update
|
|
|
|
omarchy-update-dev
|
|
omarchy-update-keyring
|
|
omarchy-update-system-pkgs
|
|
omarchy-migrate
|
|
omarchy-hook post-update
|
|
omarchy-update-aur-pkgs
|
|
omarchy-update-mise
|
|
omarchy-update-orphan-pkgs
|
|
|
|
omarchy-update-analyze-logs
|
|
|
|
# Re-check after updates so the status bar reflects any remaining updates.
|
|
if omarchy-update-available >/dev/null; then
|
|
omarchy-shell -q omarchy.system-update refresh
|
|
else
|
|
omarchy-shell -q omarchy.system-update clear
|
|
fi
|
|
|
|
# Release update-owned inhibitors before offering a reboot. A confirmed
|
|
# reboot can terminate this process before its EXIT trap gets a chance to
|
|
# remove the persistent Stay Awake marker.
|
|
restore_update_inhibitors
|
|
trap - EXIT
|
|
|
|
omarchy-update-restart
|
|
}
|
|
|
|
acquire_update_lock
|
|
|
|
trap restore_update_inhibitors EXIT
|
|
trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
|
|
|
|
if [[ ${1:-} == "-y" ]] || omarchy-update-confirm; then
|
|
omarchy-snapshot create || (($? == 127))
|
|
run_update_pipeline
|
|
fi
|