test

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"

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

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
 

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/"

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

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"

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
 

defaults-blank.sh

@@ -0,0 +1 @@
+TESTVAR="fart"

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 ""