From 50e629abd0269cee0b7a86b60a6262bd6fb73967 Mon Sep 17 00:00:00 2001
From: Casper <casperklein@users.noreply.github.com>
Date: Sat, 16 Oct 2021 11:27:17 +0200
Subject: [PATCH] fix(setup.sh): Add legacy config path check (#2250)

---
 setup.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index 100ecc4b..c8ce6191 100755
--- a/setup.sh
+++ b/setup.sh
@@ -12,6 +12,7 @@ DESIRED_CONFIG_PATH=
 DIR="$(pwd)"
 DMS_CONFIG='/tmp/docker-mailserver'
 IMAGE_NAME=
+DEFAULT_IMAGE_NAME='docker.io/mailserver/docker-mailserver:latest'
 INFO=
 PODMAN_ROOTLESS=false
 USE_SELINUX=
@@ -49,7 +50,7 @@ function _show_local_usage
     ${LBLUE}Config path, container or image adjustments${RESET}
         -i IMAGE_NAME
             Provides the name of the 'docker-mailserver' image. The default value is
-            '${WHITE}docker.io/mailserver/docker-mailserver:latest${RESET}'
+            '${WHITE}${DEFAULT_IMAGE_NAME}${RESET}'
 
         -c CONTAINER_NAME
             Provides the name of the running container.
@@ -102,8 +103,17 @@ function _get_absolute_script_directory
     DIR="$(realpath -e -L "${0}")"
     DIR="${DIR%/setup.sh}"
   fi
+}
 
-  DEFAULT_CONFIG_PATH="${DIR}/config"
+function _set_default_config_path
+{
+  if [[ -d "${DIR}/config" ]]
+  then
+    # legacy path (pre v10.2.0)
+    DEFAULT_CONFIG_PATH="${DIR}/config"
+  else
+    DEFAULT_CONFIG_PATH="${DIR}/docker-data/dms/config"
+  fi
 }
 
 function _handle_config_path
@@ -149,6 +159,7 @@ function _run_in_new_container
 function _main
 {
   _get_absolute_script_directory
+  _set_default_config_path
 
   local OPTIND
   while getopts ":c:i:p:zZR" OPT
@@ -205,7 +216,7 @@ function _main
   [[ -z ${IMAGE_NAME} ]] && IMAGE_NAME=${INFO%;*}
   if [[ -z ${IMAGE_NAME} ]]
   then
-    IMAGE_NAME=${NAME:-docker.io/mailserver/docker-mailserver:latest}
+    IMAGE_NAME=${NAME:-${DEFAULT_IMAGE_NAME}}
   fi
 
   if test -t 0