Ask for the region on the first screen and hand it to target setup

This commit is contained in:
ZacharyZhang-NY committed 2026-10-05 23:20:36 -04:00
1 parent 073f7b2fc0
commit c1d5725837
5 files changed
+93 -3

No files matched your search

+8 -2
View File
@@ -216,7 +216,10 @@ keyboard_form() {
say --foreground 8 "Press Ctrl+C to prepare this machine for another owner."
echo
omarchy_prompt_keyboard && status=0 || status=$?
omarchy_prompt_region && status=0 || status=$?
if ((status == 0)); then
omarchy_prompt_keyboard && status=0 || status=$?
fi
((status == 0)) && break
# Esc means "back", and nothing precedes the first screen, so re-ask.
@@ -298,7 +301,8 @@ Full name,${full_name:-[Skipped]}
Email address,${email_address:-[Skipped]}
Hostname,$hostname
Timezone,$timezone
Keyboard,$keyboard" |
Keyboard,$keyboard
Region,${region^}" |
gum table -s "," -p | sed "s/^/${PADDING_LEFT_SPACES}/"
echo
@@ -801,6 +805,7 @@ run_partition_execute() {
"custom_commands": [],
"omarchy_install": {
"mode": "protected",
"region": "$region",
"target_mount": "/mnt",
"boot": {
"esp_mount": "$esp_mount_in_target",
@@ -1139,6 +1144,7 @@ cat <<-_EOF_ >user_configuration.json
"custom_commands": [],
"omarchy_install": {
"mode": "full_disk",
"region": "$region",
"defer_provisioning": $defer_provisioning,
"target_mount": "/mnt",
"boot": {