From e6d9607f2520959be9c38be2524e00b48e4a45ad Mon Sep 17 00:00:00 2001
From: deathbybandaid <github@deathbybandaid.net>
Date: Wed, 5 Apr 2023 10:03:47 -0400
Subject: [PATCH] test

---
 05-Setting_TimeZone.sh                      | 16 ++++++++++++++--
 10-Checking_Dependencies.sh                 | 12 ++++++++++++
 15-Tweaking_Systemd_Journalling.sh          | 12 ++++++++++++
 20-Updating_Custom_MOTD.sh                  | 12 ++++++++++++
 30-Checking_Topgrade_Installation_Status.sh | 12 ++++++++++++
 40-Checking_Custom_Bash_Aliases.sh          | 12 ++++++++++++
 50-Checking_IPA_Realm_Join_Status.sh        | 12 ++++++++++++
 defaults-blank.sh                           |  1 +
 template_setup.sh                           | 20 +++++++++-----------
 9 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 defaults-blank.sh

diff --git a/05-Setting_TimeZone.sh b/05-Setting_TimeZone.sh
index 8ddee16..0d4d34c 100644
--- a/05-Setting_TimeZone.sh
+++ b/05-Setting_TimeZone.sh
@@ -1,12 +1,24 @@
 #!/bin/bash
 
-echo $TESTVAR
-
 ## Script Location
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
+echo $TESTVAR
+
 desired_timezone="America/Detroit"
 
 printf "$COL_LIGHT_BLUE" "* Checking Current Timezone"
diff --git a/10-Checking_Dependencies.sh b/10-Checking_Dependencies.sh
index 0410e41..1368a1b 100644
--- a/10-Checking_Dependencies.sh
+++ b/10-Checking_Dependencies.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 pkgmgr_update
 
 ## Start File Loop
diff --git a/15-Tweaking_Systemd_Journalling.sh b/15-Tweaking_Systemd_Journalling.sh
index 1c15595..78d11fd 100644
--- a/15-Tweaking_Systemd_Journalling.sh
+++ b/15-Tweaking_Systemd_Journalling.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 printf "$COL_LIGHT_BLUE" "* Vaccuming Systemd Journal"
 journalctl --vacuum-size=50M
 
diff --git a/20-Updating_Custom_MOTD.sh b/20-Updating_Custom_MOTD.sh
index 23fac02..6ec4502 100644
--- a/20-Updating_Custom_MOTD.sh
+++ b/20-Updating_Custom_MOTD.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 ## Start File Loop
 ## For .dependency files In The dependencies Directory
 MOTDDIR="/etc/update-motd.d/"
diff --git a/30-Checking_Topgrade_Installation_Status.sh b/30-Checking_Topgrade_Installation_Status.sh
index 83852de..995aa6e 100644
--- a/30-Checking_Topgrade_Installation_Status.sh
+++ b/30-Checking_Topgrade_Installation_Status.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 printf "$COL_LIGHT_BLUE" "* Checking for topgrade directory"
 topgrade_install_directory="/opt/topgrade"
 if [ ! -d "$topgrade_install_directory" ]; then
diff --git a/40-Checking_Custom_Bash_Aliases.sh b/40-Checking_Custom_Bash_Aliases.sh
index 07fd5b8..a30f925 100644
--- a/40-Checking_Custom_Bash_Aliases.sh
+++ b/40-Checking_Custom_Bash_Aliases.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 BASHRCFILE="$HOME/.bashrc"
 
 custom_bash_aliases_path="/etc/bash_aliases"
diff --git a/50-Checking_IPA_Realm_Join_Status.sh b/50-Checking_IPA_Realm_Join_Status.sh
index 6368f04..2017d04 100644
--- a/50-Checking_IPA_Realm_Join_Status.sh
+++ b/50-Checking_IPA_Realm_Join_Status.sh
@@ -5,6 +5,18 @@ SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
+fi
+
 
 # TODO setup /etc/hosts with FQDN and FreeIPA servers
 
diff --git a/defaults-blank.sh b/defaults-blank.sh
new file mode 100644
index 0000000..a7a5a8f
--- /dev/null
+++ b/defaults-blank.sh
@@ -0,0 +1 @@
+TESTVAR="fart"
diff --git a/template_setup.sh b/template_setup.sh
index 5645339..7fc170e 100644
--- a/template_setup.sh
+++ b/template_setup.sh
@@ -1,25 +1,23 @@
 #!/bin/bash
 echo "Setting up template environment"
 
-load_defaults=""
-
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-
 ## Script Location
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 git -C $SCRIPTDIR pull
 echo ""
 
-
+load_defaults=""
+case "$1" in
+    defaults) load_defaults="defaults";;
+    "") load_defaults="";;
+    *) echo "'$1' is not a valid template-setup command";;
+esac
 if [ "$load_defaults" == "defaults" ]; then
   source $SCRIPTDIR/defaults-dbb.sh
+else
+  source $SCRIPTDIR/defaults-blank.sh
 fi
-echo $TESTVAR
 
 for scriptfile in "$SCRIPTDIR"/[0-9]*.sh
 do
@@ -28,7 +26,7 @@ do
   TOPLEVELSUBDIRSCRIPTTEXT=$(echo "`basename $scriptfile | cut -f 1 -d '.' | sed 's/[0-9]/ /g; s/[\-]/ /; s/^[[:space:]]*//'`")
   printf "${COL_CYAN}" "$TOPLEVELSUBDIRSCRIPTTEXT"
 
-  /bin/bash $scriptfile
+  /bin/bash $scriptfile $load_defaults
   exit
 
   echo ""