diff --git a/netinstall.sh b/netinstall.sh index 564b3d9..a8c9336 100644 --- a/netinstall.sh +++ b/netinstall.sh @@ -57,7 +57,7 @@ case "$status" in ;; "1") - echo "Something where wrong :(" + echo "Something went wrong :( Make sure you meet the Prerequisites found in the readme." ;; "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." diff --git a/tools/arkmanager b/tools/arkmanager index 51ecddf..8d673f1 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -893,7 +893,7 @@ doStart() { if [ "$arkAutoUpdateOnStart" == "true" ]; then if ! [[ " $* " =~ " --noautoupdate " ]]; then echo "Updating server" - doUpdate --update-mods + doUpdate --update-mods --no-autostart fi fi @@ -1344,6 +1344,7 @@ doUpdate() { local saveworld= local downloadonly= local nodownload= + local noautostart= for arg in "$@"; do case "$arg" in @@ -1356,6 +1357,7 @@ doUpdate() { --saveworld) saveworld=1; ;; --update-mods) modupdate=1; ;; --backup) arkBackupPreUpdate=true; ;; + --no-autostart) noautostart=1; ;; --stagingdir=*) arkStagingDir="${arg#--stagingdir=}"; ;; --downloadonly) downloadonly=1; ;; --no-download) nodownload=1; ;; @@ -1538,10 +1540,12 @@ doUpdate() { if ! isTheServerRunning; then # we restart the server only if it was started before the update - if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then - rm -f "${arkserverroot}/.startAfterUpdate" - rm -f "${arkserverroot}/.ark-update.lock" - doStart --noautoupdate + if [ -z "$noautostart" ]; then + if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then + rm -f "${arkserverroot}/.startAfterUpdate" + rm -f "${arkserverroot}/.ark-update.lock" + doStart --noautoupdate + fi fi fi }