Remove redundant migration command preflight

This commit is contained in:
Ryan Hughes
2026-08-30 11:49:54 -04:00
parent 4c23077f80
commit 15f26cbe1b
2 changed files with 1 additions and 8 deletions
-4
View File
@@ -1189,10 +1189,6 @@ ensure_sleep_lock_service() {
run_post_upgrade_migrations() { run_post_upgrade_migrations() {
local pending_status local pending_status
if ! PATH="$package_path" command -v omarchy-migrate >/dev/null 2>&1; then
fail "omarchy-migrate is unavailable after installing the Omarchy quattro packages."
fi
log "Running Omarchy migrations" log "Running Omarchy migrations"
if ! run_as_user_omarchy OMARCHY_UPGRADE_TO_QUATTRO_LIVE=1 omarchy-migrate; then if ! run_as_user_omarchy OMARCHY_UPGRADE_TO_QUATTRO_LIVE=1 omarchy-migrate; then
fail "Omarchy migrations did not complete. Fix the error above and rerun the upgrade before rebooting." fail "Omarchy migrations did not complete. Fix the error above and rerun the upgrade before rebooting."
+1 -4
View File
@@ -105,8 +105,6 @@ function_body() {
} }
migrations_body=$(function_body run_post_upgrade_migrations) migrations_body=$(function_body run_post_upgrade_migrations)
grep -F 'fail "omarchy-migrate is unavailable after installing the Omarchy quattro packages."' <<<"$migrations_body" >/dev/null ||
fail "Omarchy 4 upgrade fails when its migration command is unavailable"
grep -F 'fail "Omarchy migrations did not complete.' <<<"$migrations_body" >/dev/null || grep -F 'fail "Omarchy migrations did not complete.' <<<"$migrations_body" >/dev/null ||
fail "Omarchy 4 upgrade fails when a migration cannot complete" fail "Omarchy 4 upgrade fails when a migration cannot complete"
grep -F 'omarchy-migrate --pending' <<<"$migrations_body" >/dev/null || grep -F 'omarchy-migrate --pending' <<<"$migrations_body" >/dev/null ||
@@ -118,14 +116,13 @@ grep -F 'pending_status != 1' <<<"$migrations_body" >/dev/null ||
grep -F 'fail "Could not verify that Omarchy migrations completed.' <<<"$migrations_body" >/dev/null || grep -F 'fail "Could not verify that Omarchy migrations completed.' <<<"$migrations_body" >/dev/null ||
fail "Omarchy 4 upgrade fails when it cannot verify migration state" fail "Omarchy 4 upgrade fails when it cannot verify migration state"
if grep -F 'return 0' <<<"$migrations_body" >/dev/null || grep -F 'warn ' <<<"$migrations_body" >/dev/null; then if grep -F 'return 0' <<<"$migrations_body" >/dev/null || grep -F 'warn ' <<<"$migrations_body" >/dev/null; then
fail "Omarchy 4 upgrade does not continue past missing or failed migrations" fail "Omarchy 4 upgrade does not continue past failed migrations"
fi fi
exercise_post_upgrade_migrations() { exercise_post_upgrade_migrations() {
local stub_migration_status="$1" stub_pending_status="$2" local stub_migration_status="$1" stub_pending_status="$2"
( (
export package_path="$ROOT/bin:/usr/bin"
log() { :; } log() { :; }
fail() { exit 1; } fail() { exit 1; }
run_as_user_omarchy() { run_as_user_omarchy() {