Skip to content

Commit 412f56a

Browse files
committed
Revert "fix(linuxgsm.sh): bug causing serverlist.csv to keep downloading"
This reverts commit b873a83.
1 parent f4e2ad1 commit 412f56a

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

linuxgsm.sh

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v19.8.3"
23+
version="v19.8.1"
2424
shortname="core"
2525
gameservername="core"
2626
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
@@ -258,15 +258,6 @@ fn_install_file(){
258258
exit
259259
}
260260

261-
fn_dl_serverlist(){
262-
# Download the latest serverlist. This is the complete list of all supported servers.
263-
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
264-
if [ ! -f "${serverlist}" ]; then
265-
echo "[ FAIL ] serverlist.csv could not be loaded."
266-
exit 1
267-
fi
268-
}
269-
270261
# Prevent LinuxGSM from running as root. Except if doing a dependency install.
271262
if [ "$(whoami)" == "root" ]; then
272263
if [ "${userinput}" == "install" ]||[ "${userinput}" == "auto-install" ]||[ "${userinput}" == "i" ]||[ "${userinput}" == "ai" ]; then
@@ -283,16 +274,21 @@ if [ "$(whoami)" == "root" ]; then
283274
fi
284275
fi
285276

277+
# Download the latest serverlist. This is the complete list of all supported servers.
278+
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
279+
if [ ! -f "${serverlist}" ]; then
280+
echo "[ FAIL ] serverlist.csv could not be loaded."
281+
exit 1
282+
fi
283+
286284
# LinuxGSM installer mode.
287285
if [ "${shortname}" == "core" ]; then
288286
if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
289-
fn_dl_serverlist
290287
{
291288
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
292289
} | column -s $'\t' -t | more
293290
exit
294291
elif [ "${userinput}" == "install" ]||[ "${userinput}" == "i" ]; then
295-
fn_dl_serverlist
296292
tail -n +2 "${serverlist}" | awk -F "," '{print $1 "," $2 "," $3}' > "${serverlistmenu}"
297293
fn_install_menu result "LinuxGSM" "Select game server to install." "${serverlistmenu}"
298294
userinput="${result}"
@@ -382,4 +378,4 @@ else
382378
getopt=$1
383379
core_getopt.sh
384380
fi
385-
fi
381+
fi

0 commit comments

Comments
 (0)