Only override serverMap if default or empty

arkmanager · Oct 5, 2017 · 47245a3 · 47245a3
1 parent e3c0931
commit 47245a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 = <>; }