Skip to content

Commit a77cbf7

Browse files
dgibbs64dgibbs64
authored
Merge pull request #4319 from GameServerManagers/feature/update-restart-bug
Release v23.5.3
2 parents 79dc5f7 + 107d48e commit a77cbf7

16 files changed

+20
-16
lines changed

‎lgsm/config-default/config-lgsm/pvrserver/_default.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1212
ip="0.0.0.0"
1313
port="7777"
14-
1514
# Maps: bridge, datacenter, sand
1615
defaultmap="datacenter"
1716
# Get an API key from https://pavlov-ms.vankrupt.com/servers/v1/key

‎lgsm/modules/core_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v23.5.2"
11+
modulesversion="v23.5.3"
1212

1313
# Core
1414

‎lgsm/modules/core_modules.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v23.5.2"
11+
modulesversion="v23.5.3"
1212

1313
# Core
1414

@@ -816,6 +816,11 @@ if [ ! -d "${lockdir}" ]; then
816816
mkdir -p "${lockdir}"
817817
fi
818818

819+
# if $USER id missing set to whoami
820+
if [ -z "${USER}" ]; then
821+
USER="$(whoami)"
822+
fi
823+
819824
# Calls on-screen messages (bootstrap)
820825
core_messages.sh
821826

‎lgsm/modules/info_messages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ fn_info_logs() {
762762
else
763763
echo -e "${gamelogdir}"
764764
# dos2unix sed 's/\r//'
765-
tail "${gamelogdir}"/* 2> /dev/null | grep -v "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
765+
tail "${gamelogdir}"/* 2> /dev/null | grep -av "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
766766
fi
767767
echo -e ""
768768
fi

‎lgsm/modules/update_fctr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ fn_update_compare() {
9393
fn_script_log_info "${localbuild} > ${remotebuildversion}"
9494

9595
if [ "${commandname}" == "UPDATE" ]; then
96+
date +%s > "${lockdir}/last-updated.lock"
9697
unset updateonstart
9798
check_status.sh
9899
# If server stopped.
@@ -120,7 +121,6 @@ fn_update_compare() {
120121
fn_firstcommand_reset
121122
fi
122123
unset exitbypass
123-
date +%s > "${lockdir}/last-updated.lock"
124124
alert="update"
125125
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
126126
alert="check-update"

‎lgsm/modules/update_mc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ fn_update_compare() {
105105
fn_script_log_info "${localbuild} > ${remotebuildversion}"
106106

107107
if [ "${commandname}" == "UPDATE" ]; then
108+
date +%s > "${lockdir}/last-updated.lock"
108109
unset updateonstart
109110
check_status.sh
110111
# If server stopped.
@@ -132,7 +133,6 @@ fn_update_compare() {
132133
fn_firstcommand_reset
133134
fi
134135
unset exitbypass
135-
date +%s > "${lockdir}/last-updated.lock"
136136
alert="update"
137137
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
138138
alert="check-update"

‎lgsm/modules/update_mcb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ fn_update_compare() {
111111
fn_script_log_info "${localbuild} > ${remotebuildversion}"
112112

113113
if [ "${commandname}" == "UPDATE" ]; then
114+
date +%s > "${lockdir}/last-updated.lock"
114115
unset updateonstart
115116
check_status.sh
116117
# If server stopped.
@@ -138,7 +139,6 @@ fn_update_compare() {
138139
fn_firstcommand_reset
139140
fi
140141
unset exitbypass
141-
date +%s > "${lockdir}/last-updated.lock"
142142
alert="update"
143143
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
144144
alert="check-update"

‎lgsm/modules/update_pmc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ fn_update_compare() {
115115
fn_script_log_info "${localbuild} > ${remotebuildversion}"
116116

117117
if [ "${commandname}" == "UPDATE" ]; then
118+
date +%s > "${lockdir}/last-updated.lock"
118119
unset updateonstart
119120
check_status.sh
120121
# If server stopped.
@@ -142,7 +143,6 @@ fn_update_compare() {
142143
fn_firstcommand_reset
143144
fi
144145
unset exitbypass
145-
date +%s > "${lockdir}/last-updated.lock"
146146
alert="update"
147147
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
148148
alert="check-update"

‎lgsm/modules/update_ts3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ fn_update_compare() {
9797
fn_script_log_info "${localbuild} > ${remotebuildversion}"
9898

9999
if [ "${commandname}" == "UPDATE" ]; then
100+
date +%s > "${lockdir}/last-updated.lock"
100101
unset updateonstart
101102
check_status.sh
102103
# If server stopped.
@@ -124,7 +125,6 @@ fn_update_compare() {
124125
fn_firstcommand_reset
125126
fi
126127
unset exitbypass
127-
date +%s > "${lockdir}/last-updated.lock"
128128
alert="update"
129129
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
130130
alert="check-update"

‎lgsm/modules/update_ut99.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ fn_update_compare() {
9191
fn_script_log_info "${localbuild} > ${remotebuildversion}"
9292

9393
if [ "${commandname}" == "UPDATE" ]; then
94+
date +%s > "${lockdir}/last-updated.lock"
9495
unset updateonstart
9596
check_status.sh
9697
# If server stopped.
@@ -118,7 +119,6 @@ fn_update_compare() {
118119
fn_firstcommand_reset
119120
fi
120121
unset exitbypass
121-
date +%s > "${lockdir}/last-updated.lock"
122122
alert="update"
123123
elif [ "${commandname}" == "CHECK-UPDATE" ]; then
124124
alert="check-update"

0 commit comments

Comments
 (0)