ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Point gum prompts at the terminal in the quattro upgrade

Browse Source 
The user-transition script is fed to bash on stdin, so the browser-close
gum confirm read the script itself: it auto-declined and swallowed the
remaining script text, leaving bash to fail on a mid-construct syntax
error. The outer confirm and reboot prompts had the same exposure when
the script runs via curl | bash. Read all three from /dev/tty.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
2026-07-20 11:39:50 -07:00
co-authored by Claude Fable 5
parent 4f1b1fceb8
commit 88d60e1468
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-upgrade-to-quattro
+3 -3
View File
@@ -311,7 +311,7 @@ Make sure you have a backup.
EOF EOF
gum confirm "Continue with upgrade?" || exit 0 gum confirm "Continue with upgrade?" </dev/tty || exit 0
fi fi
sudo_keepalive_pid="" sudo_keepalive_pid=""
@@ -1756,7 +1756,7 @@ repair_chromium_copy_url_shortcuts() {
# A running browser holds Preferences in memory and rewrites it on exit, # A running browser holds Preferences in memory and rewrites it on exit,
# which would revert this repair. Ask the user to close it first. # which would revert this repair. Ask the user to close it first.
if browser_is_running && (( ! OMARCHY_UPGRADE_YES )) && [[ -r /dev/tty ]]; then if browser_is_running && (( ! OMARCHY_UPGRADE_YES )) && [[ -r /dev/tty ]]; then
if ! gum confirm "Close all browser windows before the Copy URL shortcut is repaired, then continue"; then if ! gum confirm "Close all browser windows before the Copy URL shortcut is repaired, then continue" </dev/tty; then
echo "Skipped Copy URL shortcut repair; re-run after closing your browser." >&2 echo "Skipped Copy URL shortcut repair; re-run after closing your browser." >&2
return 0 return 0
fi fi
@@ -2401,7 +2401,7 @@ EOF
if (( auto_reboot )); then if (( auto_reboot )); then
log "Rebooting because --reboot was passed" log "Rebooting because --reboot was passed"
as_root systemctl reboot as_root systemctl reboot
elif gum confirm "Reboot to complete Quattro upgrade now?"; then elif gum confirm "Reboot to complete Quattro upgrade now?" </dev/tty; then
as_root systemctl reboot as_root systemctl reboot
else else
echo "Not rebooting. Please reboot manually after confirming there were no errors." echo "Not rebooting. Please reboot manually after confirming there were no errors."