mirror of
https://github.com/GameServerManagers/LinuxGSM.git
synced 2025-01-08 12:07:37 +08:00
Merge pull request #4319 from GameServerManagers/feature/update-restart-bug
Release v23.5.3
This commit is contained in:
commit
a77cbf7ad7
@ -11,7 +11,6 @@
|
||||
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
|
||||
ip="0.0.0.0"
|
||||
port="7777"
|
||||
|
||||
# Maps: bridge, datacenter, sand
|
||||
defaultmap="datacenter"
|
||||
# Get an API key from https://pavlov-ms.vankrupt.com/servers/v1/key
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||
|
||||
modulesversion="v23.5.2"
|
||||
modulesversion="v23.5.3"
|
||||
|
||||
# Core
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||
|
||||
modulesversion="v23.5.2"
|
||||
modulesversion="v23.5.3"
|
||||
|
||||
# Core
|
||||
|
||||
@ -816,6 +816,11 @@ if [ ! -d "${lockdir}" ]; then
|
||||
mkdir -p "${lockdir}"
|
||||
fi
|
||||
|
||||
# if $USER id missing set to whoami
|
||||
if [ -z "${USER}" ]; then
|
||||
USER="$(whoami)"
|
||||
fi
|
||||
|
||||
# Calls on-screen messages (bootstrap)
|
||||
core_messages.sh
|
||||
|
||||
|
@ -762,7 +762,7 @@ fn_info_logs() {
|
||||
else
|
||||
echo -e "${gamelogdir}"
|
||||
# dos2unix sed 's/\r//'
|
||||
tail "${gamelogdir}"/* 2> /dev/null | grep -v "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
|
||||
tail "${gamelogdir}"/* 2> /dev/null | grep -av "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
|
||||
fi
|
||||
echo -e ""
|
||||
fi
|
||||
|
@ -93,6 +93,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -120,7 +121,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -105,6 +105,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -132,7 +133,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -111,6 +111,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -138,7 +139,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -115,6 +115,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -142,7 +143,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -97,6 +97,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -124,7 +125,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -91,6 +91,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -118,7 +119,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -98,6 +98,7 @@ fn_update_compare() {
|
||||
fn_script_log_info "${localbuild} > ${remotebuildversion}"
|
||||
|
||||
if [ "${commandname}" == "UPDATE" ]; then
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
unset updateonstart
|
||||
check_status.sh
|
||||
# If server stopped.
|
||||
@ -125,7 +126,6 @@ fn_update_compare() {
|
||||
fn_firstcommand_reset
|
||||
fi
|
||||
unset exitbypass
|
||||
date +%s > "${lockdir}/last-updated.lock"
|
||||
alert="update"
|
||||
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
|
||||
alert="check-update"
|
||||
|
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.5.2"
|
||||
version="v23.5.3"
|
||||
shortname="core"
|
||||
gameservername="core"
|
||||
commandname="CORE"
|
||||
|
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.5.2"
|
||||
version="v23.5.3"
|
||||
shortname="fctr"
|
||||
gameservername="fctrserver"
|
||||
commandname="CORE"
|
||||
|
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.5.2"
|
||||
version="v23.5.3"
|
||||
shortname="jc2"
|
||||
gameservername="jc2server"
|
||||
commandname="CORE"
|
||||
|
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.5.2"
|
||||
version="v23.5.3"
|
||||
shortname="mc"
|
||||
gameservername="mcserver"
|
||||
commandname="CORE"
|
||||
|
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.5.2"
|
||||
version="v23.5.3"
|
||||
shortname="ts3"
|
||||
gameservername="ts3server"
|
||||
commandname="CORE"
|
||||
|
Loading…
Reference in New Issue
Block a user