Change: Color functions have been edited, now being more concise

Change: 'Machine Detection' function (machine_dtct) has been wrapped in an 'until' loop (now needed)
This commit is contained in:
Jane Doe 2025-01-28 19:15:14 +00:00
parent b942e7653a
commit ebd533e7cc

View file

@ -2,7 +2,7 @@
# Amelia Installer
# https://gitlab.com/prism7/archery
# Version: 8.6.0
# Version: 8.6.1
set -euo pipefail
###################################################################################################
@ -23,51 +23,21 @@
red="\e[31m"
nc="\e[0m"
MAGENTABG() {
echo -e "${magentabg} $1${nc}"
}
YELLOWBG() {
echo -e "${yellowbg} $1${nc}"
}
YELLOWL() {
echo -e "${yellowl} $1${nc}"
}
GREENBG() {
echo -e "${greenbg} $1${nc}"
}
MAGENTA() {
echo -e "${magenta} $1${nc}"
}
YELLOW() {
echo -e "${yellow} $1${nc}"
}
BLUEBG() {
echo -e "${bluebg} $1${nc}"
}
CYANBG() {
echo -e "${cyanbg} $1${nc}"
}
WHITEB() {
echo -e "${bwhite} $1${nc}"
}
GREEN() {
echo -e "${green} $1${nc}"
}
REDBG() {
echo -e "${redbg} $1${nc}"
}
BLUE() {
echo -e "${blue} $1${nc}"
}
CYAN() {
echo -e "${cyan} $1${nc}"
}
RED() {
echo -e "${red} $1${nc}"
}
NC() {
echo -e "${nc} $1${nc}"
}
MAGENTABG() { echo -e "${magentabg} $1${nc}" ;}
YELLOWBG() { echo -e "${yellowbg} $1${nc}" ;}
YELLOWL() { echo -e "${yellowl} $1${nc}" ;}
GREENBG() { echo -e "${greenbg} $1${nc}" ;}
MAGENTA() { echo -e "${magenta} $1${nc}" ;}
YELLOW() { echo -e "${yellow} $1${nc}" ;}
BLUEBG() { echo -e "${bluebg} $1${nc}" ;}
CYANBG() { echo -e "${cyanbg} $1${nc}" ;}
WHITEB() { echo -e "${bwhite} $1${nc}" ;}
GREEN() { echo -e "${green} $1${nc}" ;}
REDBG() { echo -e "${redbg} $1${nc}" ;}
BLUE() { echo -e "${blue} $1${nc}" ;}
CYAN() { echo -e "${cyan} $1${nc}" ;}
RED() { echo -e "${red} $1${nc}" ;}
NC() { echo -e "${nc} $1${nc}" ;}
# END COLOR FUNCTIONS
###################################################################################################
# PROMPT FUNCTIONS
@ -561,7 +531,7 @@ Enter [Y/n]: "
sleep 0.2
YELLOW "
### Watchdogs have been disabled
### Watchdogs will be disabled
"
elif [[ "${kill_watchdog}" == "n" ]]; then
skip
@ -6468,5 +6438,5 @@ OPTIMIZED
uefi_check
connection_check
upd_clock
machine_dtct
until machine_dtct; do : ; done
until main_menu; do : ; done