Browse Source

added preexecutable variable

pull/3151/head
Daniel Gibbs 5 years ago
parent
commit
3daa70bbba
  1. 5
      lgsm/config-default/config-lgsm/mcserver/_default.cfg
  2. 3
      lgsm/config-default/config-lgsm/rwserver/_default.cfg
  3. 3
      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

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

@ -13,7 +13,6 @@ javaram="1024" # -Xmx$1024M
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
startparameters="nogui"
executable="java -Xmx${javaram}M -jar ${jarfile}"
## Release Settings | https://docs.linuxgsm.com/game-servers/minecraft#release-settings
# Branch (release|snapshot)
@ -150,8 +149,8 @@ glibc="null"
## Game Server Directories
systemdir="${serverfiles}"
executabledir="${serverfiles}"
jarfile="${serverfiles}/minecraft_server.jar"
executable="${jarfile}"
prexecutable="java -Xmx${javaram}M -jar"
executable="./minecraft_server.jar"
servercfgdir="${systemdir}"
servercfg="server.properties"
servercfgdefault="server.properties"

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

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

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

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

4
lgsm/functions/command_debug.sh

@ -69,9 +69,9 @@ if [ "${serverpassword}" ]; then
fi
echo -e "${lightblue}Start parameters:${default}"
if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
echo -e "${executable} ${parms} -debug"
echo -e "${prexecutable} ${executable} ${parms} -debug"
else
echo -e "${executable} ${parms}"
echo -e "${prexecutable} ${executable} ${parms}"
fi
echo -e ""
echo -e "Use for identifying server issues only!"

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}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${prexecutable} ${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}\" \"${executable} ${parms}\"" | tee -a "${lgsmlog}"
echo -e "tmux new-session -d -s \"${sessionname}\" \"${prexecutable} ${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 "${executable} ${parms}"
echo -e "${prexecutable} ${executable} ${parms}"
}
fn_info_message_ports(){

Loading…
Cancel
Save