From 2b97ab1533834cd7b29293a922240e7b8aa7a385 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 13 Jan 2023 21:31:35 -0500
Subject: [PATCH] Refactor

---
 openwrtbuilder | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/openwrtbuilder b/openwrtbuilder
index 56e5784..a2ca07d 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -337,7 +337,7 @@ installDependencies() {
 getImageBuilder() {
     debug "${FUNCNAME[0]}"
 
-    declare dl_tool checksum
+    declare dl_tool
 
     if [[ -f "$IB_ARCHIVE" ]]; then
         echo "Image Builder $IB_ARCHIVE exists"
@@ -369,9 +369,16 @@ getImageBuilder() {
         echo "Archive missing"
         return 1
     fi
+}
+
+
+verifyImage() {
+    debug "${FUNCNAME[0]}"
+
+    declare checksum
 
     if hash sha256sum &>/dev/null; then
-        debug "Verifying checksums"
+        debug "Verifying Image Builder checksums"
 
         if [[ -f $SHA256_FILE ]] && askOk "$SHA256_FILE exists. Re-download?"; then
             if ! curl -so "$SHA256_FILE" "$SHA256_URL"; then
@@ -389,6 +396,11 @@ getImageBuilder() {
 
         debug "checksum return code: $?"
     fi
+}
+
+
+extractImage() {
+    debug "${FUNCNAME[0]}"
 
     echo "Extracting Image Builder archive"
     [[ ! -d "$BUILDDIR" ]] && mkdir -p "$BUILDDIR"
@@ -741,6 +753,8 @@ main() {
         (( FROM_SOURCE )) && fromSource
 
         getImageBuilder || return $?
+        verifyImage &&
+        extractImage
         addRepos
         #copyFiles
         [[ -v SSH_BACKUP_PATH ]] && sshBackup