elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-25 15:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6-dev' into 1.6-dev.unstable

Browse Source
This commit is contained in:
Ben Peddell 2016-08-29 21:00:55 +10:00
commit 547abd6dc8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/arkmanager
View File

@ -875,10 +875,11 @@ doRun() {
# start function # start function
# #
doStart() { doStart() {
touch "${arkserverroot}/.startAfterUpdate"
if [ -f "${arkserverroot}/.ark-update.lock" ]; then if [ -f "${arkserverroot}/.ark-update.lock" ]; then
local updatepid="$(<"${arkserverroot}/.ark-update.lock")" local updatepid="$(<"${arkserverroot}/.ark-update.lock")"
if kill -0 "$updatepid" >/dev/null 2>&1; then if kill -0 "$updatepid" >/dev/null 2>&1; then
touch "${arkserverroot}/.startAfterUpdate"
echo "An update is currently in progress. Start aborted" echo "An update is currently in progress. Start aborted"
return 1 return 1
fi fi
@ -939,7 +940,9 @@ doStartAll(){
# stop the ARK server # stop the ARK server
# #
doStop() { doStop() {
rm -f "${arkserverroot}/.startAfterUpdate" if [ "$1" != "update" ]; then
rm -f "${arkserverroot}/.startAfterUpdate"
fi
if isTheServerRunning; then if isTheServerRunning; then
local stopreason="$1" local stopreason="$1"