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. 6
      linuxgsm.sh

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

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

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

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

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

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

4
lgsm/functions/command_debug.sh

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

4
lgsm/functions/command_start.sh

@ -74,7 +74,7 @@ fn_start_tmux(){
echo "${version}" >> "${lockdir}/${selfname}.lock" echo "${version}" >> "${lockdir}/${selfname}.lock"
echo "${port}" >> "${lockdir}/${selfname}.lock" echo "${port}" >> "${lockdir}/${selfname}.lock"
cd "${executabledir}" || exit 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. # Create logfile.
touch "${consolelog}" touch "${consolelog}"
@ -132,7 +132,7 @@ fn_start_tmux(){
echo -e "" echo -e ""
echo -e "Command" echo -e "Command"
echo -e "=================================" 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 ""
echo -e "Error" echo -e "Error"
echo -e "=================================" echo -e "================================="

2
lgsm/functions/info_messages.sh

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

6
linuxgsm.sh

@ -387,7 +387,7 @@ else
else else
echo -e "OK" echo -e "OK"
fi fi
fi fi
else else
function_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") function_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg")
if [ "${function_file_diff}" != "" ]; then if [ "${function_file_diff}" != "" ]; then
@ -448,6 +448,10 @@ else
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${servercfgfullpath}" source "${servercfgfullpath}"
fi 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 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')" eval executable="$(grep -w executable= "${configdirserver}/_default.cfg" | sed -e 's/executable=//g')"
fi fi

Loading…
Cancel
Save