Browse Source

add preexecutable to eval

pull/3151/head
Daniel Gibbs 5 years ago
parent
commit
9e77aa6b87
  1. 2
      lgsm/config-default/config-lgsm/mcserver/_default.cfg
  2. 2
      lgsm/config-default/config-lgsm/rwserver/_default.cfg
  3. 2
      lgsm/config-default/config-lgsm/wurmserver/_default.cfg
  4. 4
      lgsm/functions/command_debug.sh
  5. 4
      lgsm/functions/command_start.sh
  6. 2
      lgsm/functions/info_messages.sh
  7. 4
      linuxgsm.sh

2
lgsm/config-default/config-lgsm/mcserver/_default.cfg

@ -149,7 +149,7 @@ glibc="null"
## Game Server Directories
systemdir="${serverfiles}"
executabledir="${serverfiles}"
prexecutable="java -Xmx${javaram}M -jar"
preexecutable="java -Xmx${javaram}M -jar"
executable="./minecraft_server.jar"
servercfgdir="${systemdir}"
servercfg="server.properties"

2
lgsm/config-default/config-lgsm/rwserver/_default.cfg

@ -153,7 +153,7 @@ glibc="null"
## Game Server Directories
systemdir="${serverfiles}"
executabledir="${serverfiles}"
prexecutable="java -Xmx${javaram}M -jar"
preexecutable="java -Xmx${javaram}M -jar"
executable="./server.jar"
servercfgdir="${systemdir}"
servercfg="server.properties"

2
lgsm/config-default/config-lgsm/wurmserver/_default.cfg

@ -148,7 +148,7 @@ glibc="2.14"
## Game Server Directories
systemdir="${serverfiles}"
executabledir="${systemdir}"
prexecutable="xvfb-run"
preexecutable="xvfb-run"
executable="./WurmServerLauncher"
servercfgdir="${systemdir}"
servercfg="${selfname}.cfg"

4
lgsm/functions/command_debug.sh

@ -73,7 +73,7 @@ if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
elif [ "${engine}" == "quake" ]; then
echo -e "${executable} ${parms} -condebug"
else
echo -e "${prexecutable} ${executable} ${parms}"
echo -e "${preexecutable} ${executable} ${parms}"
fi
echo -e ""
echo -e "Use for identifying server issues only!"
@ -114,7 +114,7 @@ elif [ "${shortname}" == "arma3" ]; then
elif [ "${engine}" == "quake" ]; then
${executable} ${parms} -condebug
else
${prexecutable} ${executable} ${parms}
${preexecutable} ${executable} ${parms}
fi
fn_lockfile_trap

4
lgsm/functions/command_start.sh

@ -74,7 +74,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}" "${prexecutable} ${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
# Create logfile.
touch "${consolelog}"
@ -132,7 +132,7 @@ fn_start_tmux(){
echo -e ""
echo -e "Command"
echo -e "================================="
echo -e "tmux new-session -d -s \"${sessionname}\" \"${prexecutable} ${executable} ${parms}\"" | tee -a "${lgsmlog}"
echo -e "tmux new-session -d -s \"${sessionname}\" \"${preexecutable} ${executable} ${parms}\"" | tee -a "${lgsmlog}"
echo -e ""
echo -e "Error"
echo -e "================================="

2
lgsm/functions/info_messages.sh

@ -556,7 +556,7 @@ fn_info_message_commandlineparms(){
unset serverpassword
fi
fn_parms
echo -e "${prexecutable} ${executable} ${parms}"
echo -e "${preexecutable} ${executable} ${parms}"
}
fn_info_message_ports(){

4
linuxgsm.sh

@ -448,6 +448,10 @@ else
# shellcheck source=/dev/null
source "${servercfgfullpath}"
fi
if [ -n "${preexecutable}" ]; then
eval preexecutable="$(grep -w preexecutable= "${configdirserver}/_default.cfg" | sed -e 's/preexecutable=//g')"
fi
eval startparameters="$(grep -w startparameters= "${configdirserver}/_default.cfg" | sed -e 's/startparameters=//g')"
eval executable="$(grep -w executable= "${configdirserver}/_default.cfg" | sed -e 's/executable=//g')"
fi

Loading…
Cancel
Save