Browse Source
Merge branch 'hotfix/v24.3.1' into develop
pull/4527/merge
Daniel Gibbs
6 months ago
No known key found for this signature in database
GPG Key ID: 2076B128385E8C55
4 changed files with
5 additions and
5 deletions
-
lgsm/modules/core_dl.sh
-
lgsm/modules/core_modules.sh
-
lgsm/modules/update_mcb.sh
-
linuxgsm.sh
|
|
@ -393,7 +393,7 @@ fn_fetch_file() { |
|
|
fi |
|
|
fi |
|
|
# Trap will remove part downloaded files if canceled. |
|
|
# Trap will remove part downloaded files if canceled. |
|
|
trap fn_fetch_trap INT |
|
|
trap fn_fetch_trap INT |
|
|
curlcmd=(curl --connect-timeout 3 --fail -L -o "${local_filedir}/${local_filename}" --retry 2) |
|
|
curlcmd=(curl --connect-timeout 3 --fail -L -o "${local_filedir}/${local_filename}" --retry 2 -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.${randomint}.212 Safari/537.36") |
|
|
|
|
|
|
|
|
# if is large file show progress, else be silent |
|
|
# if is large file show progress, else be silent |
|
|
local exitcode="" |
|
|
local exitcode="" |
|
|
|
|
|
@ -8,7 +8,7 @@ |
|
|
|
|
|
|
|
|
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" |
|
|
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" |
|
|
|
|
|
|
|
|
modulesversion="v24.3.0" |
|
|
modulesversion="v24.3.1" |
|
|
|
|
|
|
|
|
# Core |
|
|
# Core |
|
|
|
|
|
|
|
|
|
|
|
@ -53,11 +53,11 @@ fn_update_remotebuild() { |
|
|
randomint=$(tr -dc 0-9 < /dev/urandom 2> /dev/null | head -c 4 | xargs) |
|
|
randomint=$(tr -dc 0-9 < /dev/urandom 2> /dev/null | head -c 4 | xargs) |
|
|
# Get remote build info. |
|
|
# Get remote build info. |
|
|
if [ "${mcversion}" == "latest" ]; then |
|
|
if [ "${mcversion}" == "latest" ]; then |
|
|
remotebuildversion=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -Ls -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.${randomint}.212 Safari/537.36" "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*' | sed 's/.*\///' | grep -Eo "[.0-9]+[0-9]") |
|
|
remotebuildversion=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -Ls -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.${randomint}.212 Safari/537.36" "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://www.minecraft.net/bedrockdedicatedserver/bin-linux/[^"]*' | sed 's/.*\///' | grep -Eo "[.0-9]+[0-9]") |
|
|
else |
|
|
else |
|
|
remotebuildversion="${mcversion}" |
|
|
remotebuildversion="${mcversion}" |
|
|
fi |
|
|
fi |
|
|
remotebuildurl="https://minecraft.azureedge.net/bin-linux/bedrock-server-${remotebuildversion}.zip" |
|
|
remotebuildurl="https://www.minecraft.net/bedrockdedicatedserver/bin-linux/bedrock-server-${remotebuildversion}.zip" |
|
|
|
|
|
|
|
|
if [ "${firstcommandname}" != "INSTALL" ]; then |
|
|
if [ "${firstcommandname}" != "INSTALL" ]; then |
|
|
fn_print_dots "Checking remote build: ${remotelocation}" |
|
|
fn_print_dots "Checking remote build: ${remotelocation}" |
|
|
|
|
|
@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then |
|
|
set -x |
|
|
set -x |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
version="v24.3.0" |
|
|
version="v24.3.1" |
|
|
shortname="core" |
|
|
shortname="core" |
|
|
gameservername="core" |
|
|
gameservername="core" |
|
|
commandname="CORE" |
|
|
commandname="CORE" |
|
|
|
