Merge pull request #168 from drmikecrowe/greeter-matcher
Match the greeter on the part of the tagline that is not the pitch
This commit is contained in:
2 files changed
+5
-5
No files matched your search
@@ -614,7 +614,7 @@ drive_configurator() {
|
|||||||
log "Driving the installer wizard"
|
log "Driving the installer wizard"
|
||||||
|
|
||||||
# A greeter (animated logo + tagline) opens the installer; Return begins.
|
# A greeter (animated logo + tagline) opens the installer; Return begins.
|
||||||
wait_for_screen "Opinionated" 300
|
wait_for_screen "Linux by DHH" 300
|
||||||
capture_console "success-installer-00-greeter"
|
capture_console "success-installer-00-greeter"
|
||||||
press ret
|
press ret
|
||||||
|
|
||||||
@@ -731,7 +731,7 @@ drive_provision_owner() {
|
|||||||
# layout — UK leaves every letter identical to US, so the typed password (sent
|
# layout — UK leaves every letter identical to US, so the typed password (sent
|
||||||
# as raw keycodes) still matches the literal one the harness pipes to sudo.
|
# as raw keycodes) still matches the literal one the harness pipes to sudo.
|
||||||
# A greeter (animated logo + tagline) opens first boot; Return begins.
|
# A greeter (animated logo + tagline) opens first boot; Return begins.
|
||||||
wait_for_screen "Opinionated" 600
|
wait_for_screen "Linux by DHH" 600
|
||||||
capture_console "success-provision-00-greeter"
|
capture_console "success-provision-00-greeter"
|
||||||
press ret
|
press ret
|
||||||
|
|
||||||
@@ -806,7 +806,7 @@ wait_for_install() {
|
|||||||
# Deferred-provisioning installs skip the celebration and reboot on their own
|
# Deferred-provisioning installs skip the celebration and reboot on their own
|
||||||
# (no Reboot Now prompt); the first-boot greeter tagline appearing means the
|
# (no Reboot Now prompt); the first-boot greeter tagline appearing means the
|
||||||
# install finished and rebooted into setup.
|
# install finished and rebooted into setup.
|
||||||
if $PROVISION && grep -qi "Opinionated" <<<"$text"; then
|
if $PROVISION && grep -qi "Linux by DHH" <<<"$text"; then
|
||||||
log "Install finished and auto-rebooted into first-boot setup."
|
log "Install finished and auto-rebooted into first-boot setup."
|
||||||
capture_console "success-installer-15-autoreboot"
|
capture_console "success-installer-15-autoreboot"
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ drive_first_boot() {
|
|||||||
# first-boot greeter on its own. A numeric default_entry pointing at a
|
# first-boot greeter on its own. A numeric default_entry pointing at a
|
||||||
# moved entry parks Limine at the menu instead — catch that explicitly,
|
# moved entry parks Limine at the menu instead — catch that explicitly,
|
||||||
# then boot the Omarchy entry by hand so the rest of the flow still runs.
|
# then boot the Omarchy entry by hand so the rest of the flow still runs.
|
||||||
if wait_for_screen "Opinionated" 120 2>/dev/null; then
|
if wait_for_screen "Linux by DHH" 120 2>/dev/null; then
|
||||||
printf 'ok - %s\n' "the machine boots into first-boot setup unattended"
|
printf 'ok - %s\n' "the machine boots into first-boot setup unattended"
|
||||||
else
|
else
|
||||||
if ocr_screen | grep -qi "Omarchy Bootloader"; then
|
if ocr_screen | grep -qi "Omarchy Bootloader"; then
|
||||||
@@ -175,7 +175,7 @@ drive_first_boot() {
|
|||||||
log "Selecting the Omarchy entry manually to continue the run"
|
log "Selecting the Omarchy entry manually to continue the run"
|
||||||
press down; sleep 1; press down; sleep 1; press down; sleep 1
|
press down; sleep 1; press down; sleep 1; press down; sleep 1
|
||||||
press ret
|
press ret
|
||||||
wait_for_screen "Opinionated" 600
|
wait_for_screen "Linux by DHH" 600
|
||||||
else
|
else
|
||||||
echo "Neither the greeter nor the Limine menu appeared" >&2
|
echo "Neither the greeter nor the Limine menu appeared" >&2
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
Reference in new issue
Block a user