Browse Source

Merge remote-tracking branch 'origin/hotfix/v21.2.3' into feature/2711-hapis-wipe

pull/3420/head
Daniel Gibbs 5 years ago
parent
commit
8994a8681e
  1. 2
      lgsm/config-default/config-lgsm/arma3server/_default.cfg
  2. 2
      lgsm/config-default/config-lgsm/mcbserver/_default.cfg
  3. 4
      lgsm/functions/alert_discord.sh
  4. 2
      lgsm/functions/core_functions.sh
  5. 2
      lgsm/functions/install_server_files.sh
  6. 2
      linuxgsm.sh
  7. 2
      tests/tests_fctrserver.sh
  8. 2
      tests/tests_jc2server.sh
  9. 2
      tests/tests_mcserver.sh
  10. 2
      tests/tests_ts3server.sh

2
lgsm/config-default/config-lgsm/arma3server/_default.cfg

@ -166,7 +166,7 @@ consoleinteract="no"
# Do not edit
gamename="ARMA 3"
engine="realvirtuality"
glibc="2.13"
glibc="2.27"
#### Directories ####
# Edit with care

2
lgsm/config-default/config-lgsm/mcbserver/_default.cfg

@ -122,7 +122,7 @@ stopmode="5"
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="4"
querymode="2"
querytype="minecraftbe"
## Console type

4
lgsm/functions/alert_discord.sh

@ -15,13 +15,13 @@ fi
json=$(cat <<EOF
{
"username":"LinuxGSM",
"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png",
"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
"file":"content",
"embeds": [{
"color": "2067276",
"author": {
"name": "${alertemoji} ${alertsubject} ${alertemoji}",
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
},
"title": "${servername}",
"description": "${alertbody} \n More info: ${alerturl}",

2
lgsm/functions/core_functions.sh

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v21.2.2"
modulesversion="v21.2.3"
# Core

2
lgsm/functions/install_server_files.sh

@ -27,7 +27,7 @@ fn_install_server_files(){
elif [ "${shortname}" == "codwaw" ]; then
remote_fileurl="http://linuxgsm.download/CallOfDutyWorldAtWar/codwaw-lnxded-1.7-full.tar.xz"; local_filedir="${tmpdir}"; local_filename="codwaw-lnxded-1.7-full.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2c6be1bb66ea631b9b2e7ae6216c6680"
elif [ "${shortname}" == "etl" ]; then
remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/etlegacy-v2.77-i386-et-260b.tar.xz"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.77-i386-et-260b.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="7f301708f5bb1272c243f9e2d1b735dc"
remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/etlegacy-v2.77.1-i386-et-260b.tar.xz"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.77.1-i386-et-260b.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="cc307a9232abd3999be499b42d8e4ea8"
elif [ "${shortname}" == "mohaa" ]; then
remote_fileurl="http://linuxgsm.download/MedalofHonorAlliedAssault/moh_revival_v1.12_RC3.5.1.tar.xz"; local_filedir="${tmpdir}"; local_filename="moh_revival_v1.12_RC3.5.1.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="7c664538999252eeaf2b6d9949416480"
elif [ "${shortname}" == "ns" ]; then

2
linuxgsm.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.2.2"
version="v21.2.3"
shortname="core"
gameservername="core"
commandname="CORE"

2
tests/tests_fctrserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.2.2"
version="v21.2.3"
shortname="fctr"
gameservername="fctrserver"
commandname="CORE"

2
tests/tests_jc2server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.2.2"
version="v21.2.3"
shortname="jc2"
gameservername="jc2server"
commandname="CORE"

2
tests/tests_mcserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.2.2"
version="v21.2.3"
shortname="mc"
gameservername="mcserver"
commandname="CORE"

2
tests/tests_ts3server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.2.2"
version="v21.2.3"
shortname="ts3"
gameservername="ts3server"
commandname="CORE"

Loading…
Cancel
Save