Skip to content

Commit 67e1f3f

Browse files
dgibbs64dgibbs64
committed
Merge branch 'hotfix/v21.3.3'
2 parents 2caea17 + 085a9d5 commit 67e1f3f

22 files changed

+25
-51
lines changed

‎.github/pr-labeler.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/pr-labeler.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎lgsm/config-default/config-lgsm/avserver/_default.cfg

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@
1010

1111
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1212

13-
# https://steamidfinder.com
14-
adminsteamid=""
15-
if [ -n "${adminsteamid}" ]; then
16-
admincmd="--admin ${adminsteamid}"
17-
fi
18-
1913
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
20-
startparameters="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}"
14+
startparameters="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath}"
2115

2216
#### LinuxGSM Settings ####
2317

‎lgsm/data/almalinux-8.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb,libnsl
6262
mh
6363
mohaa,compat-libstdc++-33.i686
6464
mom
65-
mta
65+
mta,ncurses-compat-libs
6666
mumble
6767
nd
6868
nmrih,ncurses-libs.i686

‎lgsm/data/centos-7.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
1+
all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python3,tar,tmux,unzip,util-linux,wget,xz
22
steamcmd,glibc.i686,libstdc++.i686
33
ac
44
ahl
@@ -62,7 +62,7 @@ mcb,libnsl
6262
mh
6363
mohaa,compat-libstdc++-33.i686
6464
mom
65-
mta
65+
mta,ncurses-libs
6666
mumble
6767
nd
6868
nmrih,ncurses-libs.i686

‎lgsm/data/centos-8.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb,libnsl
6262
mh
6363
mohaa,compat-libstdc++-33.i686
6464
mom
65-
mta
65+
mta,ncurses-compat-libs
6666
mumble
6767
nd
6868
nmrih,ncurses-libs.i686

‎lgsm/data/debian-10.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/data/debian-11.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/data/debian-9.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/data/rocky-8.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb,libnsl
6262
mh
6363
mohaa,compat-libstdc++-33.i686
6464
mom
65-
mta
65+
mta,ncurses-compat-libs
6666
mumble
6767
nd
6868
nmrih,ncurses-libs.i686

‎lgsm/data/ubuntu-18.04.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/data/ubuntu-20.04.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/data/ubuntu-21.04.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mcb
6262
mh
6363
mohaa,libstdc++5:i386
6464
mom
65-
mta
65+
mta,libncursesw5
6666
mumble
6767
nd
6868
nmrih,libtinfo5:i386

‎lgsm/functions/alert_mailgun.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
mailgunapiurl="https://api.mailgun.net"
1414
fi
1515

16-
fn_print_dots "Sending Email alert: Mailgun: ${email}"
16+
fn_print_dots "Sending Email alert: Mailgun: ${mailgunemail}"
1717

1818
mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
1919
-F from="LinuxGSM <${mailgunemailfrom}>" \
@@ -24,9 +24,9 @@ mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
2424
-F text="$(cat "${alertlog}")" "${mailgunapiurl}/v3/${mailgundomain}/messages")
2525

2626
if [ -z "${mailgunsend}" ]; then
27-
fn_print_fail_nl "Sending Email alert: Mailgun: ${email}"
28-
fn_script_log_fatal "Sending Email alert: Mailgun: ${email}"
27+
fn_print_fail_nl "Sending Email alert: Mailgun: ${mailgunemail}"
28+
fn_script_log_fatal "Sending Email alert: Mailgun: ${mailgunemail}"
2929
else
30-
fn_print_ok_nl "Sending Email alert: Mailgun: ${email}"
31-
fn_script_log_pass "Sending Email alert: Mailgun: ${email}"
30+
fn_print_ok_nl "Sending Email alert: Mailgun: ${mailgunemail}"
31+
fn_script_log_pass "Sending Email alert: Mailgun: ${mailgunemail}"
3232
fi

‎lgsm/functions/check_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ fn_deps_detector(){
225225
## Check.
226226
# SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available.
227227
# This will cause SteamCMD to be installed using tar.
228-
if [ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
228+
if [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
229229
array_deps_required=( "${array_deps_required[@]/steamcmd}" )
230230
steamcmdstatus=1
231231
# Java: Added for users using Oracle JRE to bypass check.

‎lgsm/functions/core_functions.sh

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

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

11-
modulesversion="v21.3.2"
11+
modulesversion="v21.3.3"
1212

1313
# Core
1414

‎lgsm/functions/update_mta.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,7 @@ fn_update_mta_localbuild(){
9999

100100
fn_update_mta_remotebuild(){
101101
# Gets remote build info.
102-
majorversion=$(curl -s https://raw.githubusercontent.com/multitheftauto/mtasa-blue/master/Server/version.h | grep "#define MTASA_VERSION_MAJOR" | awk '{ print $3 }' | sed 's/\r//g')
103-
minorversion=$(curl -s https://raw.githubusercontent.com/multitheftauto/mtasa-blue/master/Server/version.h | grep "#define MTASA_VERSION_MINOR" | awk '{ print $3 }' | sed 's/\r//g')
104-
maintenanceversion=$(curl -s https://raw.githubusercontent.com/multitheftauto/mtasa-blue/master/Server/version.h | grep "#define MTASA_VERSION_MAINTENANCE" | awk '{ print $3 }' | sed 's/\r//g')
105-
remotebuild="${majorversion}.${minorversion}.${maintenanceversion}"
102+
remotebuild=$(curl -s "https://api.github.com/repos/multitheftauto/mtasa-blue/releases/latest" | jq -r '.tag_name')
106103
if [ "${firstcommandname}" != "INSTALL" ]; then
107104
fn_print_dots "Checking remote build: ${remotelocation}"
108105
# Checks if remotebuild variable has been set.

‎linuxgsm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.3.2"
23+
version="v21.3.3"
2424
shortname="core"
2525
gameservername="core"
2626
commandname="CORE"

‎tests/tests_fctrserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.3.2"
23+
version="v21.3.3"
2424
shortname="fctr"
2525
gameservername="fctrserver"
2626
commandname="CORE"

‎tests/tests_jc2server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.3.2"
23+
version="v21.3.3"
2424
shortname="jc2"
2525
gameservername="jc2server"
2626
commandname="CORE"

‎tests/tests_mcserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.3.2"
23+
version="v21.3.3"
2424
shortname="mc"
2525
gameservername="mcserver"
2626
commandname="CORE"

‎tests/tests_ts3server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.3.2"
23+
version="v21.3.3"
2424
shortname="ts3"
2525
gameservername="ts3server"
2626
commandname="CORE"

0 commit comments

Comments
 (0)