From 5d01bba4902a8c8546cf81f96747546e8fea35d3 Mon Sep 17 00:00:00 2001
From: Braiden Vasco <braiden-vasco@users.noreply.github.com>
Date: Sun, 2 Jul 2017 11:23:16 +0000
Subject: [PATCH] Reorder code and create separate main function

---
 build.sh | 69 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/build.sh b/build.sh
index ed4d762..dcc5d1d 100755
--- a/build.sh
+++ b/build.sh
@@ -31,6 +31,40 @@ export QUILT_REFRESH_ARGS='-p ab'
 source "$SCRIPT_DIR/common.sh"
 source "$SCRIPT_DIR/dependencies_check.sh"
 
+main() {
+  dependencies_check "$BASE_DIR/depends"
+
+  source "$BASE_DIR/config"
+
+  if [ "$(id -u)" != '0' ]; then
+    echo 'Please run as root' 1>&2
+    exit 1
+  fi
+
+  if [ -z "${IMG_NAME}" ]; then
+    echo 'IMG_NAME not set' 1>&2
+    exit 1
+  fi
+
+  if [ -z "${HOSTNAME}" ]; then
+    echo 'HOSTNAME not set' 1>&2
+    exit 1
+  fi
+
+  if [ -z "${USERNAME}" ]; then
+    echo 'USERNAME not set' 1>&2
+    exit 1
+  fi
+
+  if [ -z "${PASSWORD}" ]; then
+    echo 'PASSWORD not set' 1>&2
+    exit 1
+  fi
+
+  mkdir -p "$WORK_DIR"
+  run_base
+}
+
 log_begin() {
   log "Begin $1"
 }
@@ -208,37 +242,4 @@ run_base() {
   log_end "$BASE_DIR"
 }
 
-if [ "$(id -u)" != '0' ]; then
-  echo 'Please run as root' 1>&2
-  exit 1
-fi
-
-if [ -f config ]; then
-  source config
-fi
-
-if [ -z "${IMG_NAME}" ]; then
-  echo 'IMG_NAME not set' 1>&2
-  exit 1
-fi
-
-if [ -z "${HOSTNAME}" ]; then
-  echo 'HOSTNAME not set' 1>&2
-  exit 1
-fi
-
-if [ -z "${USERNAME}" ]; then
-  echo 'USERNAME not set' 1>&2
-  exit 1
-fi
-
-if [ -z "${PASSWORD}" ]; then
-  echo 'PASSWORD not set' 1>&2
-  exit 1
-fi
-
-dependencies_check "$BASE_DIR/depends"
-
-mkdir -p "$WORK_DIR"
-
-run_base
+main