From b713c39511715cd2d19a3a3e6d289cccf466f3a2 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 17 Jul 2023 22:44:18 -0500
Subject: [PATCH] Update linupx-scripts.sh

---
 linupx-scripts.sh | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/linupx-scripts.sh b/linupx-scripts.sh
index b41dc3b..ee2d356 100755
--- a/linupx-scripts.sh
+++ b/linupx-scripts.sh
@@ -812,14 +812,13 @@ SCRIPT_MENU() {
 	do
 		clear
 		echo
-		echo -e " ${idsCL[Green]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}  ${idsCL[White]}(ver-${VERS})${idsCL[Default]}"
-		# echo -e "${idsCL[Green]}---------------------------------------------------------------------------${idsCL[Default]}"
+		echo -e " ${idsCL[Green]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}     ${idsCL[White]}(ver-${VERS})${idsCL[Default]}"
 		DIVIDER . green 75
 		echo -e "Hostname:  ${idsCL[Cyan]}$(hostname -s)${idsCL[Default]}"
 		echo -e "Domain:    ${idsCL[Cyan]}$(hostname -d)${idsCL[Default]}"
 		echo
 		echo -e "Updates last run on:  ${idsCL[LightGreen]}${LASTRUND} ${LASTRUNT}${idsCL[Default]}"
-		echo "---------------------------------------------------------------------------"
+		DIVIDER . . 75
 		OS=($(detect_os))
 		width=14
 		printf "%-${width}s: %s\n" "Machine" "${OS[0]}"
@@ -827,7 +826,7 @@ SCRIPT_MENU() {
 		printf "%-${width}s: %s\n" "Derivative" "${OS[2]}"
 		printf "%-${width}s: %s\n" "Version" "${OS[3]}"
 		printf "%-${width}s: %s\n" "Codename/Rev" "${OS[4]}"
-		echo -e "${idsCL[LightGreen]}---------------------------------------------------------------------------${idsCL[Default]}"
+		DIVIDER . lightgreen 75
 		echo
 		echo -e " [${idsCL[Yellow]}1${idsCL[Default]}] Check for Updates/Upgrades"
 		echo -e "*[${idsCL[Yellow]}2${idsCL[Default]}] Run Updates"
@@ -896,30 +895,30 @@ MISC_MENU() {
 	do
 		clear
 		echo
-		echo -e " ${idsCL[LightGreen]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}     ${idsCL[White]}(ver-${VERS})${idsCL[Default]}"
-		echo -e "${idsCL[LightGreen]}---------------------------------------------------------------------------${idsCL[Default]}"
+		echo -e " ${idsCL[Green]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}     ${idsCL[White]}(ver-${VERS})${idsCL[Default]}"
+		echo -e "${idsCL[Green]}---------------------------------------------------------------------------${idsCL[Default]}"
 		echo -e "Hostname:  ${idsCL[Cyan]}$(hostname -s)${idsCL[Default]}"
 		echo -e "Domain:    ${idsCL[Cyan]}$(hostname -d)${idsCL[Default]}"
 		echo -e "${idsCL[LightGreen]}---------------------------------------------------------------------------${idsCL[Default]}"
-		echo -e "\n ${idsCL[Green]}MISC/OTHER SCRIPTS${idsCL[Default]}\n"
-		echo " [1] Reconfigure Network"
-		echo " [2] Remove Floppy from VM"
-		echo " [3] Fix multipath/vmware issue"
+		echo -e "\n ${idsCL[LightGreen]}MISC/OTHER SCRIPTS${idsCL[Default]}\n"
+		echo " [${idsCL[Yellow]}1${idsCL[Default]}] Reconfigure Network"
+		echo " [${idsCL[Yellow]}2${idsCL[Default]}] Remove Floppy from VM"
+		echo " [${idsCL[Yellow]}3${idsCL[Default]}] Fix multipath/vmware issue"
 		echo
 		if [ "$(IP_ALLOWED `hostname -I`)" == "true" ]; then
-			echo " [U] Update copycerts.sh SSL server"
-			echo " [D] Update DNS (10.10.10.10, 10.10.10.11)"
-			echo " [C] Change copycerts to LB-Nodes"
+			echo " [${idsCL[Yellow]}U${idsCL[Default]}] Update copycerts.sh SSL server"
+			echo " [${idsCL[Yellow]}D${idsCL[Default]}] Update DNS (10.10.10.10, 10.10.10.11)"
+			echo " [${idsCL[Yellow]}C${idsCL[Default]}] Change copycerts to LB-Nodes"
 			echo 
 		fi
-		echo " [P] Upgrade to Python v3"
-		echo " [V] Add Veeam User Account"
+		echo " [${idsCL[Yellow]}P${idsCL[Default]}] Upgrade to Python v3"
+		echo " [${idsCL[Yellow]}V${idsCL[Default]}] Add Veeam User Account"
 		echo
-		echo " [B] Back to Main Menu"
-		echo " [Q] Quit"
+		echo " [${idsCL[Yellow]}B${idsCL[Default]}] Back to Main Menu"
+		echo " [${idsCL[Yellow]}Q${idsCL[Default]}] Quit"
 		echo
 		echo
-		echo -e -n "${BOrange}Please select a [#] from above:${idsCL[Default]} "
+		echo -e -n "${idsCL[Yellow]}Please select a [#] from above:${idsCL[Default]} "
 		read -n 1 opt
 		echo
 		case $opt in
@@ -949,7 +948,7 @@ INSTALL_MENU() {
 	do
 		clear
 		echo
-		echo -e " ${idsCL[LightGreen]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}  ${DGray}(ver-${VERS})${idsCL[Default]}"
+		echo -e " ${idsCL[LightGreen]}LinUPx - L I N U X  U P D A T E  S C R I P T S${idsCL[Default]}     ${DGray}(ver-${VERS})${idsCL[Default]}"
 		echo -e "${idsCL[LightGreen]}---------------------------------------------------------------------------${idsCL[Default]}"
 		echo -e "Hostname:  ${BBlue}$(hostname -s)${idsCL[Default]}"
 		echo -e "Domain:    ${BBlue}$(hostname -d)${idsCL[Default]}"