test

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
+echo $desired_timezone
+exit
+
+if [ "$desired_timezone" == 0 ]; then
+  sudo dpkg-reconfigure tzdata
+else
+  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
+  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
+  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

common/defaults-blank

@@ -0,0 +1 @@
+desired_timezone=0

common/defaults-dbb

@@ -0,0 +1 @@
+desired_timezone="America/Detroit"

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

defaults-blank.sh

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

defaults-dbb.sh

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