From 47245a3363ccdc2d90078cedfb84367236e5b95e Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Fri, 6 Oct 2017 06:03:44 +1000 Subject: [PATCH] Only override serverMap if default or empty --- tools/arkmanager | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/arkmanager b/tools/arkmanager index 0e7154f..c5077de 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -643,7 +643,7 @@ function getServerMapName(){ local mapname="${serverMap}" # extract the map name from the active map mod - if [ -n "$serverMapModId" ]; then + if [[ ( -z "$mapname" || "$mapname" == "TheIsland" ) && -n "$serverMapModId" ]]; then mapname="$(perl -e ' my $data; { local $/; $data = <>; } @@ -937,7 +937,7 @@ doRun() { esac done < <(sed -n 's/^\(arkmod_[^= ]*\)=.*/\1/p' <"$configfile") - if [ -n "$serverMapModId" ]; then + if [[ ( -z "$serverMap" || "$serverMap" == "TheIsland" ) && -n "$serverMapModId" ]]; then serverMap="$(perl -e ' my $data; { local $/; $data = <>; }