From c329f28fee40b7ad6d5ea0620011d2f08bac8b2f Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Wed, 16 Sep 2015 18:45:19 +1000 Subject: [PATCH] Move --force argument into doUpdate --- tools/arkmanager | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index f4b1d56..2db9e71 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -448,9 +448,21 @@ doInstall() { # Stop the server, update it and then start it back. # doUpdate() { + local appupdate= + + for arg in "$@"; do + if [ "$arg" == "--force" ]; then + appupdate=1 + fi + done + cd "$arkserverroot" if isUpdateNeeded; then + appupdate=1 + fi + + if [ -n "$appupdate" ]; then forceUpdate else echo "Your server is already up to date! The most recent version is ${bnumber}." @@ -870,7 +882,7 @@ while true; do ;; update) if [ "$2" == "--force" ]; then - forceUpdate + doUpdate --force shift elif [ "$2" == "--safe" ]; then doSafeUpdate