|
@@ -66,8 +66,6 @@ core_functions.sh(){
|
|
|
|
|
|
|
|
# Bootstrap
|
|
# Bootstrap
|
|
|
# Fetches the core functions required before passed off to core_dl.sh.
|
|
# Fetches the core functions required before passed off to core_dl.sh.
|
|
|
-
|
|
|
|
|
-# Fetches core functions.
|
|
|
|
|
fn_bootstrap_fetch_file(){
|
|
fn_bootstrap_fetch_file(){
|
|
|
remote_fileurl="${1}"
|
|
remote_fileurl="${1}"
|
|
|
local_filedir="${2}"
|
|
local_filedir="${2}"
|
|
@@ -280,15 +278,15 @@ if [ "$(whoami)" == "root" ]; then
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
-# Download the latest serverlist. This is the complete list of all supported servers.
|
|
|
|
|
-fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
|
|
|
|
|
-if [ ! -f "${serverlist}" ]; then
|
|
|
|
|
- echo -e "[ FAIL ] serverlist.csv could not be loaded."
|
|
|
|
|
- exit 1
|
|
|
|
|
-fi
|
|
|
|
|
-
|
|
|
|
|
# LinuxGSM installer mode.
|
|
# LinuxGSM installer mode.
|
|
|
if [ "${shortname}" == "core" ]; then
|
|
if [ "${shortname}" == "core" ]; then
|
|
|
|
|
+ # Download the latest serverlist. This is the complete list of all supported servers.
|
|
|
|
|
+ fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
|
|
|
|
|
+ if [ ! -f "${serverlist}" ]; then
|
|
|
|
|
+ echo -e "[ FAIL ] serverlist.csv could not be loaded."
|
|
|
|
|
+ exit 1
|
|
|
|
|
+ fi
|
|
|
|
|
+
|
|
|
if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
|
|
if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
|
|
|
{
|
|
{
|
|
|
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
|
|
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
|
|
@@ -380,7 +378,7 @@ else
|
|
|
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
|
|
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
|
|
|
fn_ansi_loader
|
|
fn_ansi_loader
|
|
|
# Prevents running of core_exit.sh for Travis-CI.
|
|
# Prevents running of core_exit.sh for Travis-CI.
|
|
|
- if [ -z "${travistest}" ]; then
|
|
|
|
|
|
|
+ if [ -z "${travistest}" ]; then
|
|
|
getopt=$1
|
|
getopt=$1
|
|
|
core_getopt.sh
|
|
core_getopt.sh
|
|
|
fi
|
|
fi
|
|
@@ -480,6 +478,8 @@ fn_test_result_na(){
|
|
|
fn_print_fail_nl "TEST N/A"
|
|
fn_print_fail_nl "TEST N/A"
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+sleeptime="0"
|
|
|
|
|
+
|
|
|
echo -e "================================="
|
|
echo -e "================================="
|
|
|
echo -e "Travis CI Tests"
|
|
echo -e "Travis CI Tests"
|
|
|
echo -e "Linux Game Server Manager"
|
|
echo -e "Linux Game Server Manager"
|
|
@@ -1011,6 +1011,8 @@ echo -e "Using: ${gamename}"
|
|
|
echo -e "================================="
|
|
echo -e "================================="
|
|
|
requiredstatus="OFFLINE"
|
|
requiredstatus="OFFLINE"
|
|
|
fn_setstatus
|
|
fn_setstatus
|
|
|
-fn_print_info "Tidying up directories."
|
|
|
|
|
-rm -rfv "${serverfiles}"
|
|
|
|
|
|
|
+if [ ! -v TRAVIS ]; then
|
|
|
|
|
+ fn_print_info "Tidying up directories."
|
|
|
|
|
+ rm -rfv "${serverfiles}"
|
|
|
|
|
+fi
|
|
|
core_exit.sh
|
|
core_exit.sh
|