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

---
 05-Setting_TimeZone.sh  | 50 ++++++++++++++++++++---------------------
 common/defaults-blank   |  1 +
 common/defaults-dbb     |  1 +
 common/load-defaults.sh | 11 +++++++++
 defaults-blank.sh       |  1 -
 defaults-dbb.sh         |  1 -
 6 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 common/defaults-blank
 create mode 100644 common/defaults-dbb
 create mode 100644 common/load-defaults.sh
 delete mode 100644 defaults-blank.sh
 delete mode 100644 defaults-dbb.sh

diff --git a/05-Setting_TimeZone.sh b/05-Setting_TimeZone.sh
index 0d4d34c..7655abf 100644
--- a/05-Setting_TimeZone.sh
+++ b/05-Setting_TimeZone.sh
@@ -4,40 +4,38 @@
 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"
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 printf "$COL_LIGHT_BLUE" "* Checking Current Timezone"
 current_timezone=`cat /etc/timezone`
 
-if [ $desired_timezone != $current_timezone ]
-then
-  printf "$COL_LIGHT_BLUE" "* Setting Timezone to $desired_timezone"
-  sudo ln -fs "/usr/share/zoneinfo/$desired_timezone" /etc/localtime
-  sudo dpkg-reconfigure -f noninteractive tzdata
+echo $desired_timezone
+exit
+
+if [ "$desired_timezone" == 0 ]; then
+  sudo dpkg-reconfigure tzdata
 else
-  printf "$COL_LIGHT_BLUE" "* Timezone is already set to $desired_timezone"
+  if [ $desired_timezone != $current_timezone ]
+  then
+    printf "$COL_LIGHT_BLUE" "* Setting Timezone to $desired_timezone"
+    sudo ln -fs "/usr/share/zoneinfo/$desired_timezone" /etc/localtime
+    sudo dpkg-reconfigure -f noninteractive tzdata
+  else
+    printf "$COL_LIGHT_BLUE" "* Timezone is already set to $desired_timezone"
+  fi
 fi
 
 
 current_timezonectl=$(timedatectl | grep "zone" | sed -e 's/^[ ]*Time zone: \(.*\) (.*)$/\1/g')
-if [ $desired_timezone != $current_timezonectl ]
-then
-  timedatectl set-timezone $desired_timezone
+if [ "$desired_timezone" == 0 ]; then
+  desired_timezone=`cat /etc/timezone`
+  timedatectl set-timezone $current_timezone
 else
-  printf "$COL_LIGHT_BLUE" "* Timezone is already set to $desired_timezone"
+  if [ $desired_timezone != $current_timezonectl ]
+  then
+    printf "$COL_LIGHT_BLUE" "* Setting Timezone to $desired_timezone"
+    timedatectl set-timezone $desired_timezone
+  else
+    printf "$COL_LIGHT_BLUE" "* Timezone is already set to $desired_timezone"
+  fi
 fi
diff --git a/common/defaults-blank b/common/defaults-blank
new file mode 100644
index 0000000..7d18991
--- /dev/null
+++ b/common/defaults-blank
@@ -0,0 +1 @@
+desired_timezone=0
diff --git a/common/defaults-dbb b/common/defaults-dbb
new file mode 100644
index 0000000..2730fd2
--- /dev/null
+++ b/common/defaults-dbb
@@ -0,0 +1 @@
+desired_timezone="America/Detroit"
diff --git a/common/load-defaults.sh b/common/load-defaults.sh
new file mode 100644
index 0000000..0f33a7b
--- /dev/null
+++ b/common/load-defaults.sh
@@ -0,0 +1,11 @@
+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/common/defaults-dbb
+else
+  source $SCRIPTDIR/common/defaults-blank
+fi
diff --git a/defaults-blank.sh b/defaults-blank.sh
deleted file mode 100644
index a7a5a8f..0000000
--- a/defaults-blank.sh
+++ /dev/null
@@ -1 +0,0 @@
-TESTVAR="fart"
diff --git a/defaults-dbb.sh b/defaults-dbb.sh
deleted file mode 100644
index a7a5a8f..0000000
--- a/defaults-dbb.sh
+++ /dev/null
@@ -1 +0,0 @@
-TESTVAR="fart"