Browse Source

Merge remote-tracking branch 'origin/develop' into develop

pull/3639/head
Daniel Gibbs 3 years ago
parent
commit
07214d8daa
No known key found for this signature in database GPG Key ID: 2EBB36015C6D78E2
  1. 8
      lgsm/config-default/config-lgsm/avserver/_default.cfg
  2. 2
      lgsm/data/almalinux-8.csv
  3. 4
      lgsm/data/centos-7.csv
  4. 2
      lgsm/data/centos-8.csv
  5. 2
      lgsm/data/debian-10.csv
  6. 2
      lgsm/data/debian-11.csv
  7. 2
      lgsm/data/debian-9.csv
  8. 2
      lgsm/data/rocky-8.csv
  9. 2
      lgsm/data/ubuntu-18.04.csv
  10. 2
      lgsm/data/ubuntu-20.04.csv
  11. 2
      lgsm/data/ubuntu-21.04.csv
  12. 2
      lgsm/functions/check_deps.sh
  13. 5
      lgsm/functions/update_mta.sh

8
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 ####

2
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

Can't render this file because it has a wrong number of fields in line 2.

4
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

Can't render this file because it has a wrong number of fields in line 2.

2
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

Can't render this file because it has a wrong number of fields in line 2.

2
lgsm/data/debian-10.csv

@ -62,7 +62,7 @@ mcb
mh
mohaa,libstdc++5:i386
mom
mta
mta,libncursesw5
mumble
nd
nmrih,libtinfo5:i386

Can't render this file because it has a wrong number of fields in line 2.

2
lgsm/data/debian-11.csv

@ -62,7 +62,7 @@ mcb
mh
mohaa,libstdc++5:i386
mom
mta
mta,libncursesw5
mumble
nd
nmrih,libtinfo5:i386

Can't render this file because it has a wrong number of fields in line 2.

2
lgsm/data/debian-9.csv

@ -62,7 +62,7 @@ mcb
mh
mohaa,libstdc++5:i386
mom
mta
mta,libncursesw5
mumble
nd
nmrih,libtinfo5:i386

Can't render this file because it has a wrong number of fields in line 2.

2
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

Can't render this file because it has a wrong number of fields in line 2.

2
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

Can't render this file because it has a wrong number of fields in line 2.

2
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

Can't render this file because it has a wrong number of fields in line 2.

2
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

Can't render this file because it has a wrong number of fields in line 2.

2
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.

5
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.

Loading…
Cancel
Save