From 8a4defcffa3c1f6038674492a0b52e5af271beed Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@gmail.com>
Date: Wed, 18 Nov 2020 11:16:31 -0500
Subject: [PATCH] [refactor] Check for setup log earlier

* Check for sosetuo.log before any scripts besides so-variables are sourced to make sure the log hasn't been created yet.
---
 setup/so-setup | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index e2728a571..8c6378150 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -24,10 +24,19 @@ fi
 
 cd "$(dirname "$0")" || exit 255
 
+source ./so-variables
+
+is_reinstall=false
+if [[ -f $setup_log ]]; then
+	is_reinstall=true
+
+	# Move last setup log to backup
+	mv $setup_log $setup_log.bak
+fi
+
 source ./so-functions
 source ./so-common-functions
 source ./so-whiptail
-source ./so-variables
 
 # Parse command line arguments
 setup_type=$1
@@ -54,12 +63,6 @@ while [[ $# -gt 0 ]]; do
 	esac
 done
 
-if [[ -f $setup_log ]]; then
-	is_reinstall=true
-
-	# Move last setup log to backup
-	mv $setup_log $setup_log.bak
-fi
 
 # Begin Installation pre-processing
 parse_install_username