From bdd5b1f22c279d80a5930f0bfdacbd63b855182e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 28 Sep 2021 23:23:19 +0100
Subject: [PATCH 01/10] fix(details): steam port showing when unavailable

---
 lgsm/functions/info_messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index ef3b0a7b33..c670bec054 100755
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -1366,7 +1366,7 @@ fn_info_message_source(){
 		fn_port "RCON" rconport tcp
 		fn_port "SourceTV" sourcetvport udp
 		# Will not show if unaviable
-		if [ "${steamport}" == "0" ]||[ -z "${steamport}" ]; then
+		if [ "${steamport}" == "0" ]||[ -v "${steamport}" ]; then
 			fn_port "Steam" steamport udp
 		fi
 		fn_port "Client" clientport udp

From 70e9db36942bb86275c9b28583d110c3e39dfb66 Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Wed, 20 Oct 2021 21:10:47 +0200
Subject: [PATCH 02/10] fix(deps): add libncurses for mta (#3623)

---
 lgsm/data/almalinux-8.csv  | 2 +-
 lgsm/data/centos-7.csv     | 2 +-
 lgsm/data/centos-8.csv     | 2 +-
 lgsm/data/debian-10.csv    | 2 +-
 lgsm/data/debian-11.csv    | 2 +-
 lgsm/data/debian-9.csv     | 2 +-
 lgsm/data/rocky-8.csv      | 2 +-
 lgsm/data/ubuntu-18.04.csv | 2 +-
 lgsm/data/ubuntu-20.04.csv | 2 +-
 lgsm/data/ubuntu-21.04.csv | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index 270ede409c..df219e24cf 100644
--- 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
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index 270ede409c..d20802e8af 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -62,7 +62,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-libs
 mumble
 nd
 nmrih,ncurses-libs.i686
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index f9805f8b0a..2d52f40fce 100644
--- 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
diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
index 746e0d5cc3..91218ae02f 100644
--- 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
diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
index 35bf76936f..c793517c61 100644
--- 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
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
index 4a8790286d..520be409f1 100644
--- 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
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index 270ede409c..df219e24cf 100644
--- 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
diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
index 746e0d5cc3..91218ae02f 100644
--- 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
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index 90f4a67e0e..012befe25f 100644
--- 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
diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv
index 180be9c25f..8788b053a2 100644
--- 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

From 457238ba22d05cddc292f1e8d3a1514898aedc0e Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Wed, 20 Oct 2021 21:12:16 +0200
Subject: [PATCH 03/10] fix(deps): fix python 3 package name in centos 7
 (#3627)

---
 lgsm/data/centos-7.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index d20802e8af..9d93ca8f37 100644
--- 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

From 48c8bc7882ea7fecdf503187ed3374e6fce42dcb Mon Sep 17 00:00:00 2001
From: Claiyc <58397976+Claiyc@users.noreply.github.com>
Date: Wed, 20 Oct 2021 21:12:36 +0200
Subject: [PATCH 04/10] fix(avserver): remove adminsteamid (#3620)

---
 lgsm/config-default/config-lgsm/avserver/_default.cfg | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/avserver/_default.cfg b/lgsm/config-default/config-lgsm/avserver/_default.cfg
index 76101b2a99..bbaf07daa5 100644
--- 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 ####
 

From 3d175b48f04e68243268469cd1766ffd3a51a683 Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Sun, 24 Oct 2021 19:57:37 +0200
Subject: [PATCH 05/10] fix(mta): fix update not working, as the old way does
 not work anymore (#3625)

---
 lgsm/functions/update_mta.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index f49e549108..c789a3c217 100644
--- 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.

From 994a9ab819c92c3462be1d686224bdb95c25b84d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 24 Oct 2021 22:14:46 +0100
Subject: [PATCH 06/10] fix(deps): prevent steamcmd showing as a required when
 it is not (#3633)

* fix(deps): prevent steamcmd showing as a required when it is not

repeat issue. Looks like I got the if statement wrong.

* further improvements to if statement
---
 lgsm/functions/check_deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 0470935960..e8fd3f991e 100755
--- 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.

From 5051d339d7a68fff3d293e37b3fed037b731ab70 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 24 Oct 2021 22:55:56 +0100
Subject: [PATCH 07/10] fix(deps): resolve centos 7 wrong python name (#3634)


From 63aba3898da54e58acb0a0e0d1427c7071b7c87b Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 24 Oct 2021 23:21:40 +0100
Subject: [PATCH 08/10] fix(alert): correct mailgun email variable

---
 lgsm/functions/alert_mailgun.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh
index 4a29551042..a7b3440866 100755
--- 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

From 87a5161c675066198b1d4d2b8cee6ad14ccbacc4 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 24 Oct 2021 23:23:20 +0100
Subject: [PATCH 09/10] remove PR labeler

---
 .github/pr-labeler.yml           |  3 ---
 .github/workflows/pr-labeler.yml | 14 --------------
 2 files changed, 17 deletions(-)
 delete mode 100644 .github/pr-labeler.yml
 delete mode 100644 .github/workflows/pr-labeler.yml

diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
deleted file mode 100644
index 06092ef110..0000000000
--- a/.github/pr-labeler.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-feature: ['feature/*', 'feat/*']
-hotfix: hotfix/*
-release: release/*
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
deleted file mode 100644
index 8b73715746..0000000000
--- a/.github/workflows/pr-labeler.yml
+++ /dev/null
@@ -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 }}

From 36c419ed15384afa320c147c471879a3d758aa21 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 24 Oct 2021 23:26:53 +0100
Subject: [PATCH 10/10] Release v21.3.3

---
 lgsm/functions/core_functions.sh | 2 +-
 linuxgsm.sh                      | 2 +-
 tests/tests_fctrserver.sh        | 2 +-
 tests/tests_jc2server.sh         | 2 +-
 tests/tests_mcserver.sh          | 2 +-
 tests/tests_ts3server.sh         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index f11b6f3e05..5f2f4d8832 100755
--- 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
 
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 8c6cf9fc02..f66ec4b156 100755
--- 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"
diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
index 6df457a107..883000cd6a 100644
--- 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"
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 65a32db1af..4d753dee4d 100644
--- 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"
diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
index de0a44d180..d632b00b32 100644
--- 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"
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 4e6383bf92..9471175b82 100644
--- 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"