mirror of
https://github.com/GameServerManagers/LinuxGSM.git
synced 2025-01-08 12:07:37 +08:00
Merge branch 'hotfix/v24.1.4' into develop
This commit is contained in:
commit
9a7670ea8a
2
.github/workflows/git-sync.yml
vendored
2
.github/workflows/git-sync.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: SSH Agent
|
||||
uses: webfactory/ssh-agent@v0.8.0
|
||||
uses: webfactory/ssh-agent@v0.9.0
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
|
||||
|
||||
|
@ -8,6 +8,10 @@
|
||||
|
||||
#### Game Server Settings ####
|
||||
|
||||
## SteamCMD Login | https://docs.linuxgsm.com/steamcmd#steamcmd-login
|
||||
steamuser="username"
|
||||
steampass='password'
|
||||
|
||||
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
|
||||
ip="0.0.0.0"
|
||||
port="2302"
|
||||
@ -122,7 +126,7 @@ sleeptime="0.5"
|
||||
|
||||
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
|
||||
# Server appid
|
||||
appid="1042420"
|
||||
appid="223350"
|
||||
steamcmdforcewindows="no"
|
||||
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
|
||||
branch=""
|
||||
|
@ -204,11 +204,11 @@ fn_install_missing_deps() {
|
||||
# If automatic dependency install is unavailable.
|
||||
if [ "${autodepinstall}" != "0" ]; then
|
||||
if [ "$(command -v apt 2> /dev/null)" ]; then
|
||||
echo -e "${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}"
|
||||
echo -e " Run: '${green}${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
|
||||
elif [ "$(command -v dnf 2> /dev/null)" ]; then
|
||||
echo -e "sudo dnf install ${array_deps_missing[*]}"
|
||||
echo -e " Run: '${green}sudo dnf install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
|
||||
elif [ "$(command -v yum 2> /dev/null)" ]; then
|
||||
echo -e "sudo yum install ${array_deps_missing[*]}"
|
||||
echo -e " Run: '${green}sudo yum install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||
|
||||
modulesversion="v24.1.3"
|
||||
modulesversion="v24.1.4"
|
||||
|
||||
# Core
|
||||
|
||||
|
@ -30,13 +30,13 @@ for distro_info in "${distro_info_array[@]}"; do
|
||||
if [ -f "/etc/os-release" ] && [ "${distro_info}" == "os-release" ]; then
|
||||
distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS
|
||||
distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04
|
||||
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
|
||||
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
|
||||
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
|
||||
# Special var for rhel like distros to remove point in number e.g 8.4 to just 8.
|
||||
if [[ "${distroidlike}" == *"rhel"* ]] || [ "${distroid}" == "rhel" ]; then
|
||||
distroversionrh="$(sed -nr 's/^VERSION_ID="([0-9]*).+?"/\1/p' /etc/os-release)" # e.g. 8
|
||||
fi
|
||||
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
|
||||
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
|
||||
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
|
||||
elif [ "$(command -v lsb_release 2> /dev/null)" ] && [ "${distro_info}" == "lsb_release" ]; then
|
||||
if [ -z "${distroname}" ]; then
|
||||
distroname="$(lsb_release -sd)" # e.g. Ubuntu 22.04.3 LTS
|
||||
|
@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v24.1.3"
|
||||
version="v24.1.4"
|
||||
shortname="core"
|
||||
gameservername="core"
|
||||
commandname="CORE"
|
||||
|
Loading…
Reference in New Issue
Block a user