Merge branch 'hotfix/v21.3.3'

3 years ago · 67e1f3f678
22 changed files with 25 additions and 51 deletions
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@ -1,3 +0,0 @@
-feature: ['feature/*', 'feat/*']
-hotfix: hotfix/*
-release: release/*
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@ -1,14 +0,0 @@
-name: PR Labeler
-on:
-  pull_request:
-    types: [opened, edited, closed]
-
-jobs:
-  pr-labeler:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: TimonVS/pr-labeler-action@v3
-        with:
-          configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/lgsm/config-default/config-lgsm/avserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/avserver/_default.cfg
@ -10,14 +10,8 @@

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

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

 #### LinuxGSM Settings ####

--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@ -62,7 +62,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-compat-libs
 mumble
 nd
 nmrih,ncurses-libs.i686
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@ -1,4 +1,4 @@
-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
+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
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
@ -62,7 +62,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-libs
 mumble
 nd
 nmrih,ncurses-libs.i686
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@ -62,7 +62,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-compat-libs
 mumble
 nd
 nmrih,ncurses-libs.i686
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@ -62,7 +62,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-compat-libs
 mumble
 nd
 nmrih,ncurses-libs.i686
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/data/ubuntu-21.04.csv
+++ b/lgsm/data/ubuntu-21.04.csv
@ -62,7 +62,7 @@ mcb
 mh
 mohaa,libstdc++5:i386
 mom
-mta
+mta,libncursesw5
 mumble
 nd
 nmrih,libtinfo5:i386
--- a/lgsm/functions/alert_mailgun.sh
+++ b/lgsm/functions/alert_mailgun.sh
@ -13,7 +13,7 @@ else
 	mailgunapiurl="https://api.mailgun.net"
 fi

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

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

 if [ -z "${mailgunsend}" ]; then
-	fn_print_fail_nl "Sending Email alert: Mailgun: ${email}"
-	fn_script_log_fatal "Sending Email alert: Mailgun: ${email}"
+	fn_print_fail_nl "Sending Email alert: Mailgun: ${mailgunemail}"
+	fn_script_log_fatal "Sending Email alert: Mailgun: ${mailgunemail}"
 else
-	fn_print_ok_nl "Sending Email alert: Mailgun: ${email}"
-	fn_script_log_pass "Sending Email alert: Mailgun: ${email}"
+	fn_print_ok_nl "Sending Email alert: Mailgun: ${mailgunemail}"
+	fn_script_log_pass "Sending Email alert: Mailgun: ${mailgunemail}"
 fi
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@ -225,7 +225,7 @@ fn_deps_detector(){
 	## Check.
 	# SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available.
 	# This will cause SteamCMD to be installed using tar.
-	if [ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
+	if [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
 		array_deps_required=( "${array_deps_required[@]/steamcmd}" )
 		steamcmdstatus=1
 	# Java: Added for users using Oracle JRE to bypass check.
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@ -8,7 +8,7 @@

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

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

 # Core

--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@ -99,10 +99,7 @@ fn_update_mta_localbuild(){

 fn_update_mta_remotebuild(){
 	# Gets remote build info.
-	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')
-	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')
-	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')
-	remotebuild="${majorversion}.${minorversion}.${maintenanceversion}"
+	remotebuild=$(curl -s "https://api.github.com/repos/multitheftauto/mtasa-blue/releases/latest" | jq -r '.tag_name')
 	if [ "${firstcommandname}" != "INSTALL" ]; then
 		fn_print_dots "Checking remote build: ${remotelocation}"
 		# Checks if remotebuild variable has been set.
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v21.3.2"
+version="v21.3.3"
 shortname="core"
 gameservername="core"
 commandname="CORE"
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v21.3.2"
+version="v21.3.3"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v21.3.2"
+version="v21.3.3"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"
--- a/tests/tests_mcserver.sh
+++ b/tests/tests_mcserver.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v21.3.2"
+version="v21.3.3"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v21.3.2"
+version="v21.3.3"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"