Browse Source

fix(rust): resolve rust seed not loading to server (#3407)

pull/3418/head
Daniel Gibbs 4 years ago
committed by GitHub
parent
commit
53fdf7c705
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      lgsm/functions/command_debug.sh
  2. 1
      lgsm/functions/command_start.sh
  3. 3
      lgsm/functions/core_legacy.sh
  4. 19
      lgsm/functions/info_messages.sh
  5. 3
      linuxgsm.sh

2
lgsm/functions/command_debug.sh

@ -67,6 +67,8 @@ fi
if [ "${serverpassword}" ]; then
echo -e "${lightblue}Server password:\t${default}${serverpassword}"
fi
fn_reload_startparameters
echo -e "${lightblue}Start parameters:${default}"
if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
echo -e "${executable} ${startparameters} -debug"

1
lgsm/functions/command_start.sh

@ -71,6 +71,7 @@ fn_start_tmux(){
date '+%s' > "${lockdir}/${selfname}.lock"
echo "${version}" >> "${lockdir}/${selfname}.lock"
echo "${port}" >> "${lockdir}/${selfname}.lock"
fn_reload_startparameters
cd "${executabledir}" || exit
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"

3
lgsm/functions/core_legacy.sh

@ -79,5 +79,6 @@ if [ -z "${wsstartmap}" ]; then
fi
fn_parms(){
parms="${startparameters}"
fn_reload_startparameters
parms="${startparameters}"
}

19
lgsm/functions/info_messages.sh

@ -347,7 +347,7 @@ fn_info_message_gameserver(){
fi
if [ -n "${defaultscenario}" ]; then
# Current scenario
# Current scenario (Insurgency: Sandstorm)
if [ -n "${gdgamemode}" ]; then
echo -e "${lightblue}Current scenario:\t${default}${gdgamemode}"
fi
@ -425,7 +425,22 @@ fn_info_message_gameserver(){
# Save interval (Rust)
if [ -n "${saveinterval}" ]; then
echo -e "${lightblue}ASE:\t${default}${saveinterval} s"
echo -e "${lightblue}Save interval:\t${default}${saveinterval}s"
fi
# Seed (Rust)
if [ -n "${seed}" ]; then
echo -e "${lightblue}Seed:\t${default}${seed}"
fi
# Salt (Rust)
if [ -n "${salt}" ]; then
echo -e "${lightblue}Salt:\t${default}${salt}"
fi
# World Size (Rust)
if [ -n "${worldsize}" ]; then
echo -e "${lightblue}World size:\t${default}${worldsize}m"
fi
# Random map rotation mode (Squad and Post Scriptum)

3
linuxgsm.sh

@ -478,7 +478,7 @@ else
elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/_default.cfg"; then
eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
fi
# For legacy configs that still use parms= 15.03.21
if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")"
@ -497,7 +497,6 @@ else
fi
}
fn_reload_startparameters
# Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5"

Loading…
Cancel
Save