Skip to content

Commit 53fdf7c

Browse files
authored
fix(rust): resolve rust seed not loading to server (#3407)
1 parent 5a5a125 commit 53fdf7c

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed

lgsm/functions/command_debug.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ fi
6767
if [ "${serverpassword}" ]; then
6868
echo -e "${lightblue}Server password:\t${default}${serverpassword}"
6969
fi
70+
71+
fn_reload_startparameters
7072
echo -e "${lightblue}Start parameters:${default}"
7173
if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
7274
echo -e "${executable} ${startparameters} -debug"

lgsm/functions/command_start.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ fn_start_tmux(){
7171
date '+%s' > "${lockdir}/${selfname}.lock"
7272
echo "${version}" >> "${lockdir}/${selfname}.lock"
7373
echo "${port}" >> "${lockdir}/${selfname}.lock"
74+
fn_reload_startparameters
7475
cd "${executabledir}" || exit
7576
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
7677

lgsm/functions/core_legacy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,6 @@ if [ -z "${wsstartmap}" ]; then
7979
fi
8080

8181
fn_parms(){
82-
parms="${startparameters}"
82+
fn_reload_startparameters
83+
parms="${startparameters}"
8384
}

lgsm/functions/info_messages.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ fn_info_message_gameserver(){
347347
fi
348348

349349
if [ -n "${defaultscenario}" ]; then
350-
# Current scenario
350+
# Current scenario (Insurgency: Sandstorm)
351351
if [ -n "${gdgamemode}" ]; then
352352
echo -e "${lightblue}Current scenario:\t${default}${gdgamemode}"
353353
fi
@@ -425,7 +425,22 @@ fn_info_message_gameserver(){
425425

426426
# Save interval (Rust)
427427
if [ -n "${saveinterval}" ]; then
428-
echo -e "${lightblue}ASE:\t${default}${saveinterval} s"
428+
echo -e "${lightblue}Save interval:\t${default}${saveinterval}s"
429+
fi
430+
431+
# Seed (Rust)
432+
if [ -n "${seed}" ]; then
433+
echo -e "${lightblue}Seed:\t${default}${seed}"
434+
fi
435+
436+
# Salt (Rust)
437+
if [ -n "${salt}" ]; then
438+
echo -e "${lightblue}Salt:\t${default}${salt}"
439+
fi
440+
441+
# World Size (Rust)
442+
if [ -n "${worldsize}" ]; then
443+
echo -e "${lightblue}World size:\t${default}${worldsize}m"
429444
fi
430445

431446
# Random map rotation mode (Squad and Post Scriptum)

linuxgsm.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ else
478478
elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/_default.cfg"; then
479479
eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
480480
fi
481-
481+
482482
# For legacy configs that still use parms= 15.03.21
483483
if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then
484484
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")"
@@ -497,7 +497,6 @@ else
497497
fi
498498
}
499499

500-
fn_reload_startparameters
501500
# Load the linuxgsm.sh in to tmpdir. If missing download it.
502501
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
503502
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5"

0 commit comments

Comments
 (0)