From 14f771faf178ef4560bcd697f95e87a9a47538fb Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 17 Oct 2022 11:40:23 +0200
Subject: [PATCH] Update docker-mailserver

---
 docker-mailserver/docker-compose.yml |  2 +-
 docker-mailserver/setup.sh           | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 0b798d1..cd84276 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   mail:
-    image: docker.io/mailserver/docker-mailserver:11.0.0
+    image: docker.io/mailserver/docker-mailserver:11.2.0
     hostname: mail
     domainname: zweili.org
     env_file: mailserver.env
diff --git a/docker-mailserver/setup.sh b/docker-mailserver/setup.sh
index 62dfd3e..a17a9ee 100644
--- a/docker-mailserver/setup.sh
+++ b/docker-mailserver/setup.sh
@@ -9,7 +9,7 @@ CONTAINER_NAME=
 CRI=
 DEFAULT_CONFIG_PATH=
 DESIRED_CONFIG_PATH=
-DIR="$(pwd)"
+DIR=$(pwd)
 DMS_CONFIG='/tmp/docker-mailserver'
 IMAGE_NAME=
 DEFAULT_IMAGE_NAME='docker.io/mailserver/docker-mailserver:latest'
@@ -19,11 +19,11 @@ USE_SELINUX=
 USE_TTY=
 VOLUME=
 
-RED="\e[31m\e[1m"
-WHITE="\e[37m"
-ORANGE="\e[38;5;214m"
-LBLUE="\e[94m"
-RESET="\e[0m"
+RED=$(echo -ne '\e[31m\e[1m')
+WHITE=$(echo -ne '\e[37m')
+ORANGE=$(echo -ne '\e[38;5;214m')
+LBLUE=$(echo -ne '\e[94m')
+RESET=$(echo -ne '\e[0m')
 
 set -euEo pipefail
 shopt -s inherit_errexit 2>/dev/null || true
@@ -47,7 +47,7 @@ function __err
 function _show_local_usage
 {
   # shellcheck disable=SC2059
-  printf "${ORANGE}OPTIONS${RESET}
+  printf '%s' "${ORANGE}OPTIONS${RESET}
     ${LBLUE}Config path, container or image adjustments${RESET}
         -i IMAGE_NAME
             Provides the name of the 'docker-mailserver' image. The default value is
@@ -78,7 +78,7 @@ function _show_local_usage
   [[ ${1:-} == 'no-exit' ]] && return 0
 
   # shellcheck disable=SC2059
-  printf "${ORANGE}EXIT STATUS${RESET}
+  printf '%s' "${ORANGE}EXIT STATUS${RESET}
     Exit status is 0 if the command was successful. If there was an unexpected error, an error
     message is shown describing the error. In case of an error, the script will exit with exit
     status 1.
@@ -90,10 +90,10 @@ function _get_absolute_script_directory
 {
   if dirname "$(readlink -f "${0}")" &>/dev/null
   then
-    DIR="$(dirname "$(readlink -f "${0}")")"
+    DIR=$(dirname "$(readlink -f "${0}")")
   elif realpath -e -L "${0}" &>/dev/null
   then
-    DIR="$(realpath -e -L "${0}")"
+    DIR=$(realpath -e -L "${0}")
     DIR="${DIR%/setup.sh}"
   fi
 }
@@ -205,7 +205,7 @@ function _main
   INFO=$(${CRI} ps --no-trunc --format "{{.Image}};{{.Names}}" --filter \
     label=org.opencontainers.image.title="docker-mailserver" | tail -1)
 
-  CONTAINER_NAME=${INFO#*;}
+  [[ -z ${CONTAINER_NAME} ]] && CONTAINER_NAME=${INFO#*;}
   [[ -z ${IMAGE_NAME} ]] && IMAGE_NAME=${INFO%;*}
   if [[ -z ${IMAGE_NAME} ]]
   then
@@ -231,7 +231,7 @@ function _main
     _run_in_new_container setup "${@}"
   fi
 
-  [[ ${1} == 'help' ]] && _show_local_usage
+  [[ ${1:-} == 'help' ]] && _show_local_usage
 
   return 0
 }