Browse Source

fix(squad): move systemdir to new location (#3036)

pull/3038/head
Christian 5 years ago
committed by GitHub
parent
commit
9e7ce431b2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      lgsm/config-default/config-lgsm/squadserver/_default.cfg
  2. 5
      lgsm/functions/core_functions.sh
  3. 2
      lgsm/functions/fix.sh
  4. 23
      lgsm/functions/fix_squad.sh

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

@ -152,7 +152,7 @@ glibc="2.17"
# Edit with care # Edit with care
## Game Server Directories ## Game Server Directories
systemdir="${serverfiles}/Squad" systemdir="${serverfiles}/SquadGame"
executabledir="${serverfiles}" executabledir="${serverfiles}"
executable="./SquadGameServer.sh" executable="./SquadGameServer.sh"
servercfgdir="${systemdir}/ServerConfig" servercfgdir="${systemdir}/ServerConfig"

5
lgsm/functions/core_functions.sh

@ -450,6 +450,11 @@ functionfile="${FUNCNAME[0]}"
fn_fetch_function fn_fetch_function
} }
fix_squad.sh(){
functionfile="${FUNCNAME[0]}"
fn_fetch_function
}
fix_ss3.sh(){ fix_ss3.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_fetch_function fn_fetch_function

2
lgsm/functions/fix.sh

@ -70,6 +70,8 @@ if [ "${commandname}" != "INSTALL" ]&&[ -z "${fixbypass}" ]; then
fix_sfc.sh fix_sfc.sh
elif [ "${shortname}" == "sof2" ]; then elif [ "${shortname}" == "sof2" ]; then
fix_sof2.sh fix_sof2.sh
elif [ "${shortname}" == "squad" ]; then
fix_squad.sh
elif [ "${shortname}" == "ss3" ]; then elif [ "${shortname}" == "ss3" ]; then
fix_ss3.sh fix_ss3.sh
elif [ "${shortname}" == "tf2" ]; then elif [ "${shortname}" == "tf2" ]; then

23
lgsm/functions/fix_squad.sh

@ -0,0 +1,23 @@
#!/bin/bash
# LinuxGSM fix_squad.sh function
# Author: Christian Birk
# Website: https://linuxgsm.com
# Description: Resolves various issues with Squad.
# As the server base dir changed for the game, we need to migrate the default config from the old to the new location
oldservercfg="${serverfiles}/Squad/ServerConfig/${servercfg}"
if [ -f "${oldservercfg}" ] && [ -f "${servercfgfullpath}" ]; then
# diff old and new config - if it is different move the old config over the new one
if [ $(diff -c "${oldservercfg}" "${servercfgfullpath}" | wc -l) -gt 0 ]; then
fixname="Migrate server config to new Game folder"
fn_fix_msg_start
mv -v "${oldservercfg}" "${servercfgfullpath}"
fn_fix_msg_end
else
fixname="remove the same config from old configdir"
fn_fix_msg_start
rm -f "${oldservercfg}"
fn_fix_msg_end
fi
fi
Loading…
Cancel
Save