Skip to content

Commit d0e38df

Browse files
authored
fix: revert part of #3280 to fix upgrade (#3341)
1 parent bb0565d commit d0e38df

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

linuxgsm.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ githubbranch="master"
5454
# Core function that is required first.
5555
core_functions.sh(){
5656
functionfile="${FUNCNAME[0]}"
57-
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
57+
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5"
5858
}
5959

6060
# Bootstrap
@@ -331,7 +331,7 @@ fi
331331
# LinuxGSM installer mode.
332332
if [ "${shortname}" == "core" ]; then
333333
# Download the latest serverlist. This is the complete list of all supported servers.
334-
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
334+
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
335335
if [ ! -f "${serverlist}" ]; then
336336
echo -e "[ FAIL ] serverlist.csv could not be loaded."
337337
exit 1
@@ -376,7 +376,7 @@ else
376376
# Load the default config. If missing download it. If changed reload it.
377377
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
378378
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
379-
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
379+
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
380380
fi
381381
if [ ! -f "${configdirserver}/_default.cfg" ]; then
382382
mkdir -p "${configdirserver}"
@@ -410,7 +410,7 @@ else
410410
source "${configdirserver}/_default.cfg"
411411
# Load the common.cfg config. If missing download it.
412412
if [ ! -f "${configdirserver}/common.cfg" ]; then
413-
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
413+
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
414414
# shellcheck source=/dev/null
415415
source "${configdirserver}/common.cfg"
416416
else
@@ -419,7 +419,7 @@ else
419419
fi
420420
# Load the secrets-common.cfg config. If missing download it.
421421
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
422-
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
422+
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
423423
# shellcheck source=/dev/null
424424
source "${configdirserver}/secrets-common.cfg"
425425
else
@@ -428,7 +428,7 @@ else
428428
fi
429429
# Load the instance.cfg config. If missing download it.
430430
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
431-
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
431+
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
432432
# shellcheck source=/dev/null
433433
source "${configdirserver}/${selfname}.cfg"
434434
else
@@ -437,7 +437,7 @@ else
437437
fi
438438
# Load the secrets-instance.cfg config. If missing download it.
439439
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
440-
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
440+
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
441441
# shellcheck source=/dev/null
442442
source "${configdirserver}/secrets-${selfname}.cfg"
443443
else
@@ -469,7 +469,7 @@ else
469469

470470
# Load the linuxgsm.sh in to tmpdir. If missing download it.
471471
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
472-
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
472+
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5"
473473
fi
474474

475475
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

0 commit comments

Comments
 (0)