Merge branch 'master' into 1.6-dev

This commit is contained in:
Ben Peddell 2016-08-29 21:00:07 +10:00
commit e75a8285d7

View File

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