gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/v20.1.2' into develop

pull/2766/head
Daniel Gibbs 5 years ago
parent
17efcab6ca 72a439645f
commit
1eba255a61
2 changed files with 36 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      lgsm/functions/check_deps.sh
  2. 18
      lgsm/functions/fix_ark.sh

34
lgsm/functions/check_deps.sh
View File

@ -272,9 +272,14 @@ fn_found_missing_deps(){
fi fi
if [ "${steamcmdfail}" ]; then if [ "${steamcmdfail}" ]; then
echo -e "" echo -e ""
fn_print_failure_nl "Missing dependencies required to run SteamCMD." if [ "${function_selfname}" == "command_install.sh" ]; then
fn_script_log_fatal "Missing dependencies required to run SteamCMD." fn_print_failure_nl "Missing dependencies required to run SteamCMD."
core_exit.sh fn_script_log_fatal "Missing dependencies required to run SteamCMD."
core_exit.sh
else
fn_print_error_nl "Missing dependencies required to run SteamCMD."
fn_script_log_error "Missing dependencies required to run SteamCMD."
fi
fi fi
else else
fn_print_complete_nl "Install dependencies completed." fn_print_complete_nl "Install dependencies completed."
@ -293,9 +298,14 @@ fn_found_missing_deps(){
fi fi
if [ "${steamcmdfail}" ]; then if [ "${steamcmdfail}" ]; then
echo -e "" echo -e ""
fn_print_failure_nl "Missing dependencies required to run SteamCMD." if [ "${function_selfname}" == "command_install.sh" ]; then
fn_script_log_fatal "Missing dependencies required to run SteamCMD." fn_print_failure_nl "Missing dependencies required to run SteamCMD."
core_exit.sh fn_script_log_fatal "Missing dependencies required to run SteamCMD."
core_exit.sh
else
fn_print_error_nl "Missing dependencies required to run SteamCMD."
fn_script_log_error "Missing dependencies required to run SteamCMD."
fi
fi fi
echo -e "" echo -e ""
fi fi
@ -327,7 +337,7 @@ fn_deps_build_debian(){
array_deps_missing=() array_deps_missing=()
# LinuxGSM requirements. # LinuxGSM requirements.
array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq tmux ) array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq tmux netcat )
# 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.
if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then
@ -445,15 +455,15 @@ fn_deps_build_redhat(){
# LinuxGSM requirements. # LinuxGSM requirements.
# CentOS # CentOS
if [ "${distroversion}" == "7" ]; then if [ "${distroversion}" == "7" ]; then
array_deps_required=( epel-release curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux ) array_deps_required=( epel-release curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat )
elif [ "${distroversion}" == "8" ]; then elif [ "${distroversion}" == "8" ]; then
array_deps_required=( epel-release curl wget util-linux python36 file tar gzip bzip2 unzip binutils bc jq tmux ) array_deps_required=( epel-release curl wget util-linux python36 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat )
elif [ "${distroid}" == "fedora" ]; then elif [ "${distroid}" == "fedora" ]; then
array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux ) array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat )
elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux ) array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat )
else else
array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux ) array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat )
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.

18
lgsm/functions/fix_ark.sh
View File

@ -4,11 +4,21 @@
# Website: https://linuxgsm.com # Website: https://linuxgsm.com
# Description: Resolves various issues with ARK: Survival Evolved. # Description: Resolves various issues with ARK: Survival Evolved.
# Symlinking the SteamCMD directory into the correct ARK directory so that the mods auto-management will work. # removes the symlink if broken. fixes issue with older versions of LinuxGSM linking to /home/arkserver/steamcmd
if [ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]; then # rather than ${HOME}/.steam. This fix could be deprecated eventually.
ln -s "${HOME}/.steam/steamcmd" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" if [ ! -e "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]||[ ! -e "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then
fixname="broken steamcmd symlink"
fn_fix_msg_start
rm -f "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
rm -f "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
fn_fix_msg_end
fi fi
if [ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then # Symlinking the SteamCMD directory into the correct ARK directory so that the mods auto-management will work.
if [ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]||[ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then
fixname="steamcmd symlink"
fn_fix_msg_start
ln -s "${HOME}/.steam/steamcmd" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
ln -s "${HOME}/Steam/steamapps" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ln -s "${HOME}/Steam/steamapps" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
fn_fix_msg_end
fi fi

Write Preview
Loading…
Cancel
Save