Skip to content

Commit 5f4753f

Browse files
committed
Merge branch 'hotfix/v24.1.4'
2 parents 1e165ce + e492e09 commit 5f4753f

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

.github/workflows/git-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: SSH Agent
16-
uses: webfactory/ssh-agent@v0.8.0
16+
uses: webfactory/ssh-agent@v0.9.0
1717
with:
1818
ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
1919

lgsm/config-default/config-lgsm/dayzserver/_default.cfg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
#### Game Server Settings ####
1010

11+
## SteamCMD Login | https://docs.linuxgsm.com/steamcmd#steamcmd-login
12+
steamuser="username"
13+
steampass='password'
14+
1115
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1216
ip="0.0.0.0"
1317
port="2302"
@@ -122,7 +126,7 @@ sleeptime="0.5"
122126

123127
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
124128
# Server appid
125-
appid="1042420"
129+
appid="223350"
126130
steamcmdforcewindows="no"
127131
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
128132
branch=""

lgsm/modules/check_deps.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ fn_install_missing_deps() {
204204
# If automatic dependency install is unavailable.
205205
if [ "${autodepinstall}" != "0" ]; then
206206
if [ "$(command -v apt 2> /dev/null)" ]; then
207-
echo -e "${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}"
207+
echo -e " Run: '${green}${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
208208
elif [ "$(command -v dnf 2> /dev/null)" ]; then
209-
echo -e "sudo dnf install ${array_deps_missing[*]}"
209+
echo -e " Run: '${green}sudo dnf install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
210210
elif [ "$(command -v yum 2> /dev/null)" ]; then
211-
echo -e "sudo yum install ${array_deps_missing[*]}"
211+
echo -e " Run: '${green}sudo yum install ${array_deps_missing[*]}${default}' as root to install missing dependencies."
212212
fi
213213
fi
214214

lgsm/modules/core_modules.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v24.1.3"
11+
modulesversion="v24.1.4"
1212

1313
# Core
1414

lgsm/modules/info_distro.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ for distro_info in "${distro_info_array[@]}"; do
3030
if [ -f "/etc/os-release" ] && [ "${distro_info}" == "os-release" ]; then
3131
distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS
3232
distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04
33+
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
34+
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
35+
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
3336
# Special var for rhel like distros to remove point in number e.g 8.4 to just 8.
3437
if [[ "${distroidlike}" == *"rhel"* ]] || [ "${distroid}" == "rhel" ]; then
3538
distroversionrh="$(sed -nr 's/^VERSION_ID="([0-9]*).+?"/\1/p' /etc/os-release)" # e.g. 8
3639
fi
37-
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
38-
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
39-
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
4040
elif [ "$(command -v lsb_release 2> /dev/null)" ] && [ "${distro_info}" == "lsb_release" ]; then
4141
if [ -z "${distroname}" ]; then
4242
distroname="$(lsb_release -sd)" # e.g. Ubuntu 22.04.3 LTS

linuxgsm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
2424
set -x
2525
fi
2626

27-
version="v24.1.3"
27+
version="v24.1.4"
2828
shortname="core"
2929
gameservername="core"
3030
commandname="CORE"

0 commit comments

Comments
 (0)