gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix(update): non-steam updates to not always require restarting if stopped (#3173)

pull/3199/head
Daniel Gibbs 4 years ago
parent
e1293964ee
commit
043caa8ea5
8 changed files with 69 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      lgsm/functions/update_factorio.sh
  2. 18
      lgsm/functions/update_jediknight2.sh
  3. 13
      lgsm/functions/update_minecraft.sh
  4. 14
      lgsm/functions/update_minecraft_bedrock.sh
  5. 14
      lgsm/functions/update_mta.sh
  6. 13
      lgsm/functions/update_mumble.sh
  7. 14
      lgsm/functions/update_ts3.sh
  8. 14
      lgsm/functions/update_vintagestory.sh

14
lgsm/functions/update_factorio.sh
View File

@ -95,12 +95,14 @@ fn_update_factorio_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_factorio_dl fn_update_factorio_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
fn_firstcommand_reset command_start.sh
exitbypass=1 fn_firstcommand_reset
command_stop.sh exitbypass=1
fn_firstcommand_reset command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

18
lgsm/functions/update_jediknight2.sh
View File

@ -5,9 +5,7 @@
# Website: https://linuxgsm.com # Website: https://linuxgsm.com
# Description: Handles updating of jk2 servers. # Description: Handles updating of jk2 servers.
local commandname="UPDATE" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
local commandaction="Update"
local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_jk2_dl(){ fn_update_jk2_dl(){
fn_fetch_file "https://github.com/mvdevs/jk2mv/releases/download/${remotebuild}/jk2mv-v${remotebuild}-dedicated.zip" "" "" "" "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "" "norun" "noforce" "nomd5" fn_fetch_file "https://github.com/mvdevs/jk2mv/releases/download/${remotebuild}/jk2mv-v${remotebuild}-dedicated.zip" "" "" "" "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "" "norun" "noforce" "nomd5"
@ -31,6 +29,7 @@ fn_update_jk2_localbuild(){
fn_print_dots "Checking local build: ${remotelocation}" fn_print_dots "Checking local build: ${remotelocation}"
# Uses log file to gather info. # Uses log file to gather info.
# Log is generated and cleared on startup but filled on shutdown. # Log is generated and cleared on startup but filled on shutdown.
requirerestart=1
localbuild=$(grep "\"version\"" "${consolelogdir}"/* 2>/dev/null | sed 's/.*://' | awk '{print $1}' | head -n 1) localbuild=$(grep "\"version\"" "${consolelogdir}"/* 2>/dev/null | sed 's/.*://' | awk '{print $1}' | head -n 1)
if [ -z "${localbuild}" ]; then if [ -z "${localbuild}" ]; then
fn_print_error "Checking local build: ${remotelocation}" fn_print_error "Checking local build: ${remotelocation}"
@ -119,11 +118,14 @@ fn_update_jk2_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_jk2_dl fn_update_jk2_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

13
lgsm/functions/update_minecraft.sh
View File

@ -104,11 +104,14 @@ fn_update_minecraft_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_minecraft_dl fn_update_minecraft_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

14
lgsm/functions/update_minecraft_bedrock.sh
View File

@ -35,6 +35,7 @@ fn_update_minecraft_localbuild(){
fn_print_dots "Checking local build: ${remotelocation}" fn_print_dots "Checking local build: ${remotelocation}"
# Uses log file to gather info. # Uses log file to gather info.
# Log is generated and cleared on startup but filled on shutdown. # Log is generated and cleared on startup but filled on shutdown.
requirerestart=1
localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //') localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //')
if [ -z "${localbuild}" ]; then if [ -z "${localbuild}" ]; then
fn_print_error "Checking local build: ${remotelocation}" fn_print_error "Checking local build: ${remotelocation}"
@ -123,11 +124,14 @@ fn_update_minecraft_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_minecraft_dl fn_update_minecraft_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

14
lgsm/functions/update_mta.sh
View File

@ -31,6 +31,7 @@ fn_update_mta_localbuild(){
fn_print_dots "Checking local build: ${remotelocation}" fn_print_dots "Checking local build: ${remotelocation}"
# Uses log file to gather info. # Uses log file to gather info.
# Gives time for log file to generate. # Gives time for log file to generate.
requirerestart=1
if [ ! -f "${serverfiles}/mods/deathmatch/logs/server.log" ]; then if [ ! -f "${serverfiles}/mods/deathmatch/logs/server.log" ]; then
fn_print_error "Checking local build: ${remotelocation}" fn_print_error "Checking local build: ${remotelocation}"
fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info" fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info"
@ -152,11 +153,14 @@ fn_update_mta_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_mta_dl fn_update_mta_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

13
lgsm/functions/update_mumble.sh
View File

@ -88,11 +88,14 @@ fn_update_mumble_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_mumble_dl fn_update_mumble_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

14
lgsm/functions/update_ts3.sh
View File

@ -35,6 +35,7 @@ fn_update_ts3_localbuild(){
fn_print_dots "Checking local build: ${remotelocation}" fn_print_dots "Checking local build: ${remotelocation}"
# Uses log file to gather info. # Uses log file to gather info.
# Gives time for log file to generate. # Gives time for log file to generate.
requirerestart=1
if [ ! -d "${serverfiles}/logs" ]||[ -z "$(find "${serverfiles}/logs/"* -name 'ts3server*_0.log' 2> /dev/null)" ]; then if [ ! -d "${serverfiles}/logs" ]||[ -z "$(find "${serverfiles}/logs/"* -name 'ts3server*_0.log' 2> /dev/null)" ]; then
fn_print_error "Checking local build: ${remotelocation}" fn_print_error "Checking local build: ${remotelocation}"
fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info" fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info"
@ -150,11 +151,14 @@ fn_update_ts3_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_ts3_dl fn_update_ts3_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning

14
lgsm/functions/update_vintagestory.sh
View File

@ -88,11 +88,14 @@ fn_update_vs_compare(){
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
exitbypass=1 exitbypass=1
fn_update_vs_dl fn_update_vs_dl
exitbypass=1 if [ "${requirerestart}" == "1" ]; then
command_start.sh exitbypass=1
exitbypass=1 command_start.sh
command_stop.sh fn_firstcommand_reset
fn_firstcommand_reset exitbypass=1
command_stop.sh
fn_firstcommand_reset
fi
# If server started. # If server started.
else else
fn_print_restart_warning fn_print_restart_warning
@ -131,7 +134,6 @@ fn_update_vs_compare(){
# The location where the builds are checked and downloaded. # The location where the builds are checked and downloaded.
remotelocation="vintagestory.at" remotelocation="vintagestory.at"
apiurl="http://api.${remotelocation}/stable-unstable.json" apiurl="http://api.${remotelocation}/stable-unstable.json"
localversionfile="${datadir}/vintagestoryversion"
if [ "${firstcommandname}" == "INSTALL" ]; then if [ "${firstcommandname}" == "INSTALL" ]; then
fn_update_vs_remotebuild fn_update_vs_remotebuild

Write Preview
Loading…
Cancel
Save