Browse Source

changes to integrate ts3 with tmux

pull/2565/head
Daniel Gibbs 6 years ago
parent
commit
15bd3106f1
  1. 2
      lgsm/config-default/config-lgsm/ts3server/_default.cfg
  2. 25
      lgsm/functions/check_deps.sh

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

@ -115,7 +115,7 @@ glibc="2.17"
## Server Specific Directories ## Server Specific Directories
systemdir="${serverfiles}" systemdir="${serverfiles}"
executabledir="${serverfiles}" executabledir="${serverfiles}"
executable="./ts3server_startscript.sh" executable="./ts3server_minimal_runscript.sh"
servercfg="${servicename}.ini" servercfg="${servicename}.ini"
servercfgdefault="ts3server.ini" servercfgdefault="ts3server.ini"
servercfgdir="${serverfiles}" servercfgdir="${serverfiles}"

25
lgsm/functions/check_deps.sh

@ -337,13 +337,10 @@ fn_deps_build_debian(){
# LinuxGSM requirements. # LinuxGSM requirements.
array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq ) array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq )
# All servers except ts3 require tmux. if [ "$(command -v tmux 2>/dev/null)" ]; then
if [ "${shortname}" != "ts3" ]; then tmuxcheck=1 # Added for users compiling tmux from source to bypass check.
if [ "$(command -v tmux 2>/dev/null)" ]; then else
tmuxcheck=1 # Added for users compiling tmux from source to bypass check. array_deps_required+=( tmux )
else
array_deps_required+=( tmux )
fi
fi fi
# All servers except ts3, mumble, GTA and minecraft servers require libstdc++6 and lib32gcc1. # All servers except ts3, mumble, GTA and minecraft servers require libstdc++6 and lib32gcc1.
@ -400,7 +397,7 @@ fn_deps_build_debian(){
else else
array_deps_required+=( openjdk-8-jre-headless ) array_deps_required+=( openjdk-8-jre-headless )
fi fi
# Medal of Honor: Allied Assault # Medal of Honor: Allied Assault
elif [ "${shortname}" == "mohaa" ]; then elif [ "${shortname}" == "mohaa" ]; then
array_deps_required+=( libstdc++5:i386 ) array_deps_required+=( libstdc++5:i386 )
# Project Zomboid # Project Zomboid
@ -467,13 +464,11 @@ fn_deps_build_redhat(){
fi fi
# All servers except ts3 require tmux. # All servers except ts3 require tmux.
if [ "${shortname}" != "ts3" ]; then if [ "$(command -v tmux 2>/dev/null)" ]; then
if [ "$(command -v tmux 2>/dev/null)" ]; then # Added for users compiling tmux from source to bypass check.
# Added for users compiling tmux from source to bypass check. tmuxcheck=1
tmuxcheck=1 else
else array_deps_required+=( tmux )
array_deps_required+=( tmux )
fi
fi fi
# All servers except ts3, mumble, multi theft auto and minecraft servers require glibc.i686 and libstdc++.i686. # All servers except ts3, mumble, multi theft auto and minecraft servers require glibc.i686 and libstdc++.i686.

Loading…
Cancel
Save