From 0442559cc92cbd973bc3103e1cb3382459f8dea9 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 16 Apr 2017 13:52:36 +0100
Subject: [PATCH] Steamlining bootstrap process

---
 lgsm/functions/core_functions.sh | 14 ++++++++------
 linuxgsm.sh                      |  9 ++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index 461fc602e..a821bf95b 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -14,7 +14,7 @@ fi
 
 core_dl.sh(){
 functionfile="${FUNCNAME}"
-fn_fetch_function
+fn_bootstrap_fetch_file
 }
 
 core_exit.sh(){
@@ -34,7 +34,7 @@ fn_fetch_function
 
 core_messages.sh(){
 functionfile="${FUNCNAME}"
-fn_fetch_function
+fn_bootstrap_fetch_file
 }
 
 
@@ -541,11 +541,13 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
+# Calls on-screen messages (bootstrap)
+core_messages.sh
+
+#Calls file downloader (bootstrap)
+core_dl.sh
+
 # Calls the global Ctrl-C trap
 core_trap.sh
 
-# Calls on-screen messages
-core_messages.sh
 
-#Calls file downloader
-core_dl.sh
diff --git a/linuxgsm.sh b/linuxgsm.sh
index d4a68c534..a76833bbe 100644
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -39,12 +39,7 @@ githubuser="GameServerManagers"
 githubrepo="LinuxGSM"
 githubbranch="feature/config"
 
-# Core Functions that are required first
-core_dl.sh(){
-	functionfile="${FUNCNAME}"
-	fn_bootstrap_fetch_file
-}
-
+# Core Function that is required first
 core_functions.sh(){
 	functionfile="${FUNCNAME}"
 	fn_bootstrap_fetch_file
@@ -297,9 +292,9 @@ if [ "${shortname}" == "core" ]; then
 	else
 		fn_install_getopt
 	fi
+
 # LinuxGSM Server Mode
 else
-	core_dl.sh
 	core_functions.sh
 
 	# Load LinuxGSM configs