From 9bb77cfcd172d882918a4c1828cf51e6deab082e Mon Sep 17 00:00:00 2001
From: deathbybandaid <github@deathbybandaid.net>
Date: Sat, 12 Mar 2022 15:19:05 -0500
Subject: [PATCH] test

---
 00-dependencies.sh => 00-Checking_Dependencies.sh |  1 -
 01-motd.sh => 01-Updating_Custom_MOTD.sh          |  1 -
 ...=> 02-Checking_Topgrade_Installation_Status.sh |  1 -
 ...iases.sh => 03-Checking_Custom_Bash_Aliases.sh |  1 -
 ...oin.sh => 04-Checking_IPA_Realm_Join_Status.sh |  1 -
 template_setup.sh                                 | 15 +++++++++++++--
 6 files changed, 13 insertions(+), 7 deletions(-)
 rename 00-dependencies.sh => 00-Checking_Dependencies.sh (96%)
 rename 01-motd.sh => 01-Updating_Custom_MOTD.sh (94%)
 rename 02-topgrade.sh => 02-Checking_Topgrade_Installation_Status.sh (98%)
 rename 03-bash_aliases.sh => 03-Checking_Custom_Bash_Aliases.sh (95%)
 rename 04-freeipa_realm_join.sh => 04-Checking_IPA_Realm_Join_Status.sh (97%)

diff --git a/00-dependencies.sh b/00-Checking_Dependencies.sh
similarity index 96%
rename from 00-dependencies.sh
rename to 00-Checking_Dependencies.sh
index 0e2ee4e..c13f04c 100644
--- a/00-dependencies.sh
+++ b/00-Checking_Dependencies.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-echo "Checking Dependencies"
 
 ## Script Location
 SCRIPTDIR=$(dirname $0)
diff --git a/01-motd.sh b/01-Updating_Custom_MOTD.sh
similarity index 94%
rename from 01-motd.sh
rename to 01-Updating_Custom_MOTD.sh
index d84fb77..701ab02 100644
--- a/01-motd.sh
+++ b/01-Updating_Custom_MOTD.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-echo "Checking For Custom MOTD"
 
 ## Script Location
 SCRIPTDIR=$(dirname $0)
diff --git a/02-topgrade.sh b/02-Checking_Topgrade_Installation_Status.sh
similarity index 98%
rename from 02-topgrade.sh
rename to 02-Checking_Topgrade_Installation_Status.sh
index 4768808..23fcb91 100644
--- a/02-topgrade.sh
+++ b/02-Checking_Topgrade_Installation_Status.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-echo "Checking Topgrade Situation"
 
 ## Script Location
 SCRIPTDIR=$(dirname $0)
diff --git a/03-bash_aliases.sh b/03-Checking_Custom_Bash_Aliases.sh
similarity index 95%
rename from 03-bash_aliases.sh
rename to 03-Checking_Custom_Bash_Aliases.sh
index 7ceb673..a0f41bf 100644
--- a/03-bash_aliases.sh
+++ b/03-Checking_Custom_Bash_Aliases.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-echo "Checking Custom Bash Aliases"
 
 ## Script Location
 SCRIPTDIR=$(dirname $0)
diff --git a/04-freeipa_realm_join.sh b/04-Checking_IPA_Realm_Join_Status.sh
similarity index 97%
rename from 04-freeipa_realm_join.sh
rename to 04-Checking_IPA_Realm_Join_Status.sh
index 28ee511..4af5d4b 100644
--- a/04-freeipa_realm_join.sh
+++ b/04-Checking_IPA_Realm_Join_Status.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-echo "Checking IPA Realm Join Status"
 
 ## Script Location
 SCRIPTDIR=$(dirname $0)
diff --git a/template_setup.sh b/template_setup.sh
index 4943655..ec8c9f0 100644
--- a/template_setup.sh
+++ b/template_setup.sh
@@ -4,6 +4,18 @@ echo "Setting up template environment"
 # * colors
 # * dbb avatar
 
+# Set these values so the installer can still run in color
+COL_NC='\e[0m' # No Color
+COL_LIGHT_GREEN='\e[1;32m'
+COL_LIGHT_RED='\e[1;31m'
+TICK="[${COL_LIGHT_GREEN}✓${COL_NC}]"
+CROSS="[${COL_LIGHT_RED}✗${COL_NC}]"
+INFO="[i]"
+# shellcheck disable=SC2034
+DONE="${COL_LIGHT_GREEN} done!${COL_NC}"
+OVER="\\r\\033[K"
+
+
 ## Script Location
 SCRIPTDIR=$(dirname $0)
 git -C $SCRIPTDIR pull
@@ -14,8 +26,7 @@ do
 
 
   TOPLEVELSUBDIRSCRIPTTEXT=$(echo "`basename $scriptfile | cut -f 1 -d '.' | sed 's/[0-9\-]/ /g'`")
-
-  echo "$TOPLEVELSUBDIRSCRIPTTEXT"
+  echo -e "${COL_LIGHT_GREEN} $TOPLEVELSUBDIRSCRIPTTEXT"
 
   /bin/bash $scriptfile