Browse Source

fix(update): resolve broken minecraft updater since v1.16.3 (#3067)

* fix(mcserver): resolve minecraft now outputting windows line endings

* fix(update): resolve broken minecraft updater since v1.16.3
pull/3068/head
Daniel Gibbs 5 years ago
committed by GitHub
parent
commit
78cb4689ec
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      lgsm/functions/update_factorio.sh
  2. 7
      lgsm/functions/update_minecraft.sh
  3. 1
      lgsm/functions/update_minecraft_bedrock.sh
  4. 1
      lgsm/functions/update_mta.sh
  5. 1
      lgsm/functions/update_mumble.sh
  6. 1
      lgsm/functions/update_steamcmd.sh
  7. 1
      lgsm/functions/update_ts3.sh

1
lgsm/functions/update_factorio.sh

@ -112,6 +112,7 @@ fn_update_factorio_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

7
lgsm/functions/update_minecraft.sh

@ -35,7 +35,7 @@ fn_update_minecraft_localbuild(){
# Gets local build info.
fn_print_dots "Checking local build: ${remotelocation}"
# Uses log file to gather info.
localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //')
localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
if [ -z "${localbuild}" ]; then
fn_print_error "Checking local build: ${remotelocation}"
fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info"
@ -49,7 +49,7 @@ fn_update_minecraft_localbuild(){
command_start.sh
fn_firstcommand_reset
totalseconds=0
localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //')
localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
while [ -z "${localbuild}" ]; do
sleep 1
fn_print_info "Checking local build: ${remotelocation}: waiting for log file: ${totalseconds}"
@ -58,7 +58,7 @@ fn_update_minecraft_localbuild(){
fn_script_log_info "Waiting for log file to generate"
fi
localbuild=$(grep Version "$(ls -tr "${consolelogdir}"/* 2>/dev/null)" | tail -1 | sed 's/.*Version //')
localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
if [ "${totalseconds}" -gt "120" ]; then
localbuild="0"
fn_print_error "Checking local build: ${remotelocation}: waiting for log file"
@ -145,6 +145,7 @@ fn_update_minecraft_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

1
lgsm/functions/update_minecraft_bedrock.sh

@ -139,6 +139,7 @@ fn_update_minecraft_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

1
lgsm/functions/update_mta.sh

@ -168,6 +168,7 @@ fn_update_mta_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

1
lgsm/functions/update_mumble.sh

@ -104,6 +104,7 @@ fn_update_mumble_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

1
lgsm/functions/update_steamcmd.sh

@ -113,6 +113,7 @@ fn_update_steamcmd_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

1
lgsm/functions/update_ts3.sh

@ -166,6 +166,7 @@ fn_update_ts3_compare(){
command_start.sh
fn_firstcommand_reset
fi
unset exitbypass
date +%s > "${lockdir}/lastupdate.lock"
alert="update"
alert.sh

Loading…
Cancel
Save