From 33c26d34441bdf1b04ef288d9cf91195568291ac Mon Sep 17 00:00:00 2001
From: Matias Barcenas <MPX.4132@Gmail.com>
Date: Sat, 12 Aug 2017 17:46:49 -0500
Subject: [PATCH] Rewrote header auto-resizing using FormatUtils.

---
 fluxion.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/fluxion.sh b/fluxion.sh
index 28445ec..feacd2f 100755
--- a/fluxion.sh
+++ b/fluxion.sh
@@ -225,16 +225,15 @@ trap handle_exit SIGINT SIGHUP
 # Design
 function fluxion_header() {
 	conditional_clear
-	local headerWidth=$(($(tput cols) - 2))
-	local headerMessage="${CRed}FLUXION $FLUXIONVersion    ${CRed}< F${CYel}luxion ${CRed}I${CYel}s ${CRed}T${CYel}he ${CRed}F${CYel}uture >"
-	local headerMessageEscaped=$(echo "$headerMessage" | sed -r 's/\\(e|033)\[[0-9];?[0-9]*m//g')
-	local headerMessageWidth=${#headerMessageEscaped}
-	local headerMessagePadding=$(($(($headerWidth - $headerMessageWidth)) / 2))
-	echo -e "`printf "$CRed[%${headerWidth}s]\n" "" | sed -r "s/ /~/g"`"
-	echo -e "`printf "$CRed[%${headerWidth}s]\n" ""`"
-	echo -e "`printf "$CRed[%${headerMessagePadding}s%b%${headerMessagePadding}s$CBlu]\n" "" "$headerMessage" ""`"
-	echo -e "`printf "$CBlu[%${headerWidth}s]\n" ""`"
-	echo -e "`printf "$CBlu[%${headerWidth}s]\n$CClr" "" | sed -r "s/ /~/g"`"
+	format_autosize "[%*s]\n"
+	local verticalBorder=$FormatAutosize
+	echo -e "`printf "$CRed$verticalBorder" "" | sed -r "s/ /~/g"`"
+	printf "$CRed$verticalBorder" ""
+	format_autosize "[%*s${CRed}FLUXION $FLUXIONVersion    ${CRed}< F${CYel}luxion ${CRed}I${CYel}s ${CRed}T${CYel}he ${CRed}F${CYel}uture >%*s$CBlu]\n"; printf "$FormatAutosize" "" ""
+	printf "$CBlu$verticalBorder" ""
+	echo -e "`printf "$CBlu$verticalBorder" "" | sed -r "s/ /~/g"`$CClr"
+	echo
+	echo
 }
 
 ####################################### < Start > ######################################
@@ -283,10 +282,10 @@ if [ ! $FLUXIONDebug ]; then
 	format_center " ⌡▓      ⌡◘▒▓▒   ⌡◘▒▓▒◘   └▓/  \▓┘   ⌡▓╝   ⌡◙▒▓▒◙   ⌡▓  \▓┘"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenter";
 	format_center "¯¯¯     ¯¯¯¯¯¯  ¯¯¯¯¯¯¯  ¯¯¯    ¯¯¯ ¯¯¯¯  ¯¯¯¯¯¯¯  ¯¯¯¯¯¯¯¯"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenter";
 	 
-	for line in "${FLUXIONBanner[@]}"; do
-		echo "$line"; sleep 0.1
-	done
-
+	#for line in "${FLUXIONBanner[@]}"; do
+	#	echo "$line"; sleep 0.01
+	#done
+	echo "${FLUXIONBanner[@]}"
 	echo
 
 	sleep 0.1