Browse Source

remove ${parms}

pull/3315/head
Daniel Gibbs 5 years ago
parent
commit
92ac5a7fa6
  1. 14
      lgsm/functions/command_debug.sh
  2. 4
      lgsm/functions/command_start.sh

14
lgsm/functions/command_debug.sh

@ -69,11 +69,11 @@ if [ "${serverpassword}" ]; then
fi
echo -e "${lightblue}Start parameters:${default}"
if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
echo -e "${executable} ${parms} -debug"
echo -e "${executable} ${startparameters} -debug"
elif [ "${engine}" == "quake" ]; then
echo -e "${executable} ${parms} -condebug"
echo -e "${executable} ${startparameters} -condebug"
else
echo -e "${preexecutable} ${executable} ${parms}"
echo -e "${preexecutable} ${executable} ${startparameters}"
fi
echo -e ""
echo -e "Use for identifying server issues only!"
@ -103,19 +103,19 @@ fn_script_log_info "Lockfile generated"
fn_script_log_info "${lockdir}/${selfname}.lock"
cd "${executabledir}" || exit
# Note: do not add double quotes to ${executable} ${parms}.
# Note: do not add double quotes to ${executable} ${startparameters}.
if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
${executable} ${parms} -debug
${executable} ${startparameters} -debug
elif [ "${shortname}" == "arma3" ]; then
# Arma3 requires semicolons in the module list, which need to
# be escaped for regular (tmux) loading, but need to be
# stripped when loading straight from the console.
${executable} ${parms//\\;/;}
elif [ "${engine}" == "quake" ]; then
${executable} ${parms} -condebug
${executable} ${startparameters} -condebug
else
# shellcheck disable=SC2086
${preexecutable} ${executable} ${parms}
${preexecutable} ${executable} ${startparameters}
fi
fn_lockfile_trap

4
lgsm/functions/command_start.sh

@ -72,7 +72,7 @@ fn_start_tmux(){
echo "${version}" >> "${lockdir}/${selfname}.lock"
echo "${port}" >> "${lockdir}/${selfname}.lock"
cd "${executabledir}" || exit
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
# Create logfile.
touch "${consolelog}"
@ -130,7 +130,7 @@ fn_start_tmux(){
echo -e ""
echo -e "Command"
echo -e "================================="
echo -e "tmux new-session -d -s \"${sessionname}\" \"${preexecutable} ${executable} ${parms}\"" | tee -a "${lgsmlog}"
echo -e "tmux new-session -d -s \"${sessionname}\" \"${preexecutable} ${executable} ${startparameters}\"" | tee -a "${lgsmlog}"
echo -e ""
echo -e "Error"
echo -e "================================="

Loading…
Cancel
Save