From 65a89cd51feb41e6bcbef8d99c352954e2f2dfdc Mon Sep 17 00:00:00 2001
From: Jane Doe <ifeelsosecurenow@gmail.com>
Date: Sun, 10 Nov 2024 11:32:08 +0000
Subject: [PATCH] Change: A few enhanced visuals will be used only if the 'pv'
 package is installed/exists.

---
 Amelia.sh | 63 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/Amelia.sh b/Amelia.sh
index 42efad2..1734234 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # https://gitlab.com/prism7/archery
-# Version: 8.0.7
+# Version: 8.0.8
 
         set -euo pipefail
 ###################################################################################################
@@ -214,6 +214,7 @@ stage_fail() {
         failure
 }
 completion_err() {
+    if [[ -e /usr/bin/pv ]]; then
         sleep 0.2
         CYAN "
 
@@ -221,6 +222,15 @@ completion_err() {
 
         (*) ${nc}Please complete${yellowl} '${stage_prompt}' ${nc}to continue
         "| pv -qL 70
+    else
+        sleep 0.2
+        CYAN "
+
+
+
+        (*) ${nc}Please complete${yellowl} '${stage_prompt}' ${nc}to continue
+        "
+    fi
 }
 intel() {
         line2
@@ -314,8 +324,13 @@ first_check() {
         if [[ "${tty}" == *"tty"* && "${run_as}" == "root" ]]; then
             until slct_font; do : ; done
         else
-            MAGENTABG "      'Terminus Font' detected      ==>      Log in as 'ROOT' in console & re-run to enable       "| pv -qL 70
-            echo
+            if [[ -e /usr/bin/pv ]]; then
+                MAGENTABG "      'Terminus Font' detected      ==>      Log in as 'ROOT' in console & re-run to enable       "| pv -qL 70
+                echo
+            else
+                MAGENTABG "      'Terminus Font' detected      ==>      Log in as 'ROOT' in console & re-run to enable       "
+                echo
+            fi
         fi
     fi
 
@@ -486,10 +501,17 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M
         YELLOW "
 
         >  Make a selection: "
+    if [[ -e /usr/bin/pv ]]; then
         CYAN "
 
             (*) ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Guided Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}functions
         " | pv -qL 70
+    else
+        CYAN "
+
+            (*) ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Guided Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}functions
+        "
+    fi
         NC "
 
             [1]  Personalization
@@ -3764,14 +3786,23 @@ instl() {
 
         install="yes"
     if [[ -z "${lcl_slct}" ]]; then
-        sleep 0.2
-        CYAN "
+        if [[ -e /usr/bin/pv ]]; then
+            sleep 0.2
+            CYAN "
 
 
         (*) ${nc}Please complete ${yellowl}'Locale & Keyboard Layout Selection'${nc} to continue
-        "| pv -qL 70
-        until slct_locale; do : ; done
-        until slct_kbd; do : ; done
+            "| pv -qL 70
+        else
+            sleep 0.2
+            CYAN "
+
+
+        (*) ${nc}Please complete ${yellowl}'Locale & Keyboard Layout Selection'${nc} to continue
+            "
+        fi
+            until slct_locale; do : ; done
+            until slct_kbd; do : ; done
     fi
 
     if [[ -z "${USERNAME}" ]]; then
@@ -5706,10 +5737,10 @@ set_vars() {
                 mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
             # Nvidia
             elif [[ "${vendor}" == "Nvidia" ]]; then
-                # Mkinitcpio Hooks (Encryption)
-                mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)"
                 # Mkinitcpio Modules (Encryption) [Early Nvidia KMS]
                 mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm ${fs_mod})"
+                # Mkinitcpio Hooks (Encryption)
+                mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)"
                 # Graphics Kernel Boot Options
                 vga_bootopts="nvidia.NVreg_UsePageAttributeTable=1 "
             # Amd
@@ -5733,8 +5764,6 @@ set_vars() {
             fi
         ## Configuration = 'No'
         elif [[ "${vgaconf}" == "n" ]]; then
-            # Mkinitcpio Hooks (Encryption)
-            mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
         	    # Nvidia
             if [[ "${vendor}" == "Nvidia" ]]; then
                 # Mkinitcpio Modules (Encryption)
@@ -5744,6 +5773,8 @@ set_vars() {
                 # Mkinitcpio Modules (Encryption)
                 mkinitcpio_mods="MODULES=(${fs_mod})"
             fi
+            # Mkinitcpio Hooks (Encryption)
+            mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
         fi
         ### Kernel Boot Options (Encryption)
         boot_opts="${encr_root_bootopts}${encr_swap_bootopts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}${zram_bootopts}"
@@ -5768,10 +5799,10 @@ set_vars() {
                 mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
             # Nvidia
             elif [[ "${vendor}" == "Nvidia" ]]; then
-                # Mkinitcpio Hooks
-                mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)"
                 # Mkinitcpio Modules [Early Nvidia KMS]
                 mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)"
+                # Mkinitcpio Hooks
+                mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)"
                 # Graphics Kernel Boot Options
                 vga_bootopts="nvidia.NVreg_UsePageAttributeTable=1 "
             # Amd
@@ -5795,8 +5826,6 @@ set_vars() {
             fi
         ## Configuration = 'No'
         elif [[ "${vgaconf}" == "n" ]]; then
-            # Mkinitcpio Hooks
-        	    mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
         	    # Nvidia
             if [[ "${vendor}" == "Nvidia" ]]; then
                 # Mkinitcpio Modules
@@ -5806,6 +5835,8 @@ set_vars() {
                 # Mkinitcpio Modules
                 mkinitcpio_mods="MODULES=()"
             fi
+            # Mkinitcpio Hooks
+        	    mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
         fi
         
         if [[ "${autoroot}" == "y" ]]; then