From 15f26cbe1bf6a072c9f20063888f0485e8b421fe Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 30 Aug 2026 11:49:54 -0400 Subject: [PATCH] Remove redundant migration command preflight --- bin/omarchy-upgrade-to-quattro | 4 ---- test/shell.d/upgrade-to-quattro-test.sh | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/bin/omarchy-upgrade-to-quattro b/bin/omarchy-upgrade-to-quattro index 2fb9ab7d..596cb457 100755 --- a/bin/omarchy-upgrade-to-quattro +++ b/bin/omarchy-upgrade-to-quattro @@ -1189,10 +1189,6 @@ ensure_sleep_lock_service() { run_post_upgrade_migrations() { 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" 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." diff --git a/test/shell.d/upgrade-to-quattro-test.sh b/test/shell.d/upgrade-to-quattro-test.sh index b53eba04..0648409d 100644 --- a/test/shell.d/upgrade-to-quattro-test.sh +++ b/test/shell.d/upgrade-to-quattro-test.sh @@ -105,8 +105,6 @@ function_body() { } 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 || fail "Omarchy 4 upgrade fails when a migration cannot complete" 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 || 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 - fail "Omarchy 4 upgrade does not continue past missing or failed migrations" + fail "Omarchy 4 upgrade does not continue past failed migrations" fi exercise_post_upgrade_migrations() { local stub_migration_status="$1" stub_pending_status="$2" ( - export package_path="$ROOT/bin:/usr/bin" log() { :; } fail() { exit 1; } run_as_user_omarchy() {