From b15dde2dc97b5bc80b55e59ae099366d4e20b683 Mon Sep 17 00:00:00 2001 From: Dylan Bridgman Date: Tue, 12 Aug 2025 13:44:28 +0200 Subject: [PATCH] Install `gum` prior to the preflight guard (#684) * Use `read` instead of `gum` in the preflight guard * Revert "Use `read` instead of `gum` in the preflight guard" This reverts commit 759dbb70454dccc27b78b198bf077e076750fefc. * Install `gum`, if required, at the beginning of `install.sh` * `gum` is already installed by the `presentation.sh` stage * Use existing structure --------- Co-authored-by: David Heinemeier Hansson --- install.sh | 3 ++- install/preflight/gum.sh | 3 +++ install/preflight/presentation.sh | 3 --- install/preflight/tte.sh | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 install/preflight/gum.sh delete mode 100644 install/preflight/presentation.sh create mode 100644 install/preflight/tte.sh diff --git a/install.sh b/install.sh index f8d07875..996c50a6 100755 --- a/install.sh +++ b/install.sh @@ -27,9 +27,10 @@ show_subtext() { } # Install prerequisites +source $OMARCHY_INSTALL/preflight/gum.sh source $OMARCHY_INSTALL/preflight/guard.sh source $OMARCHY_INSTALL/preflight/aur.sh -source $OMARCHY_INSTALL/preflight/presentation.sh +source $OMARCHY_INSTALL/preflight/tte.sh source $OMARCHY_INSTALL/preflight/migrations.sh # Configuration diff --git a/install/preflight/gum.sh b/install/preflight/gum.sh new file mode 100644 index 00000000..a38e8032 --- /dev/null +++ b/install/preflight/gum.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +yay -S --noconfirm --needed gum diff --git a/install/preflight/presentation.sh b/install/preflight/presentation.sh deleted file mode 100644 index 98957ae9..00000000 --- a/install/preflight/presentation.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -yay -S --noconfirm --needed gum python-terminaltexteffects diff --git a/install/preflight/tte.sh b/install/preflight/tte.sh new file mode 100644 index 00000000..dd3de4b0 --- /dev/null +++ b/install/preflight/tte.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +yay -S --noconfirm --needed python-terminaltexteffects