Sfoglia il codice sorgente

Steamlining bootstrap process

Daniel Gibbs 9 anni fa
parent
commit
0442559cc9
2 ha cambiato i file con 10 aggiunte e 13 eliminazioni
  1. 8 6
      lgsm/functions/core_functions.sh
  2. 2 7
      linuxgsm.sh

+ 8 - 6
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

+ 2 - 7
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