elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-27 00:38: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-09-07 05:36:09 +10:00
commit d7d664342a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netinstall.sh
View File

@ -57,7 +57,7 @@ case "$status" in
;; ;;
"1") "1")
echo "Something where wrong :(" echo "Something went wrong :( Make sure you meet the Prerequisites found in the readme."
;; ;;
"2") "2")
echo "WARNING: A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it." echo "WARNING: A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."

14
tools/arkmanager
View File

@ -893,7 +893,7 @@ doStart() {
if [ "$arkAutoUpdateOnStart" == "true" ]; then if [ "$arkAutoUpdateOnStart" == "true" ]; then
if ! [[ " $* " =~ " --noautoupdate " ]]; then if ! [[ " $* " =~ " --noautoupdate " ]]; then
echo "Updating server" echo "Updating server"
doUpdate --update-mods doUpdate --update-mods --no-autostart
fi fi
fi fi
@ -1344,6 +1344,7 @@ doUpdate() {
local saveworld= local saveworld=
local downloadonly= local downloadonly=
local nodownload= local nodownload=
local noautostart=
for arg in "$@"; do for arg in "$@"; do
case "$arg" in case "$arg" in
@ -1356,6 +1357,7 @@ doUpdate() {
--saveworld) saveworld=1; ;; --saveworld) saveworld=1; ;;
--update-mods) modupdate=1; ;; --update-mods) modupdate=1; ;;
--backup) arkBackupPreUpdate=true; ;; --backup) arkBackupPreUpdate=true; ;;
--no-autostart) noautostart=1; ;;
--stagingdir=*) arkStagingDir="${arg#--stagingdir=}"; ;; --stagingdir=*) arkStagingDir="${arg#--stagingdir=}"; ;;
--downloadonly) downloadonly=1; ;; --downloadonly) downloadonly=1; ;;
--no-download) nodownload=1; ;; --no-download) nodownload=1; ;;
@ -1538,10 +1540,12 @@ doUpdate() {
if ! isTheServerRunning; then if ! isTheServerRunning; then
# we restart the server only if it was started before the update # we restart the server only if it was started before the update
if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then if [ -z "$noautostart" ]; then
rm -f "${arkserverroot}/.startAfterUpdate" if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then
rm -f "${arkserverroot}/.ark-update.lock" rm -f "${arkserverroot}/.startAfterUpdate"
doStart --noautoupdate rm -f "${arkserverroot}/.ark-update.lock"
doStart --noautoupdate
fi
fi fi
fi fi
} }