From 4bbfb69dee0b0ce3606ef76091f4301213c0b117 Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Sun, 27 Nov 2022 17:08:45 +0000
Subject: [PATCH] chore:update services

---
 mail/docker-compose.yml     |  4 ++--
 mail/setup.sh               | 43 ++++++++++++++++---------------------
 songlify/docker-compose.yml |  2 +-
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml
index ed37fb4..92c3e16 100644
--- a/mail/docker-compose.yml
+++ b/mail/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '3.7'
 services:
   mail:
-    image: mailserver/docker-mailserver:10.4.0
+    image: mailserver/docker-mailserver:11.2.0
     hostname: ${HOSTNAME}
     domainname: ${DOMAINNAME}
     container_name: ${CONTAINER_NAME}
@@ -39,7 +39,7 @@ services:
       - internal
 
   roundcube:
-    image: roundcube/roundcubemail:1.4.12-apache
+    image: roundcube/roundcubemail:1.6.x-apache
     restart: always
     depends_on:
       - mail
diff --git a/mail/setup.sh b/mail/setup.sh
index 8dd22b4..a17a9ee 100755
--- a/mail/setup.sh
+++ b/mail/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,14 +19,14 @@ 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
+shopt -s inherit_errexit 2>/dev/null || true
 trap '__err "${BASH_SOURCE}" "${FUNCNAME[0]:-?}" "${BASH_COMMAND:-?}" "${LINENO:-?}" "${?:-?}"' ERR
 
 function __err
@@ -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.
@@ -88,20 +88,12 @@ function _show_local_usage
 
 function _get_absolute_script_directory
 {
-  if [[ "$(uname)" == 'Darwin' ]]
-  then
-    readlink() {
-      # requires coreutils
-      greadlink "${@:+$@}"
-    }
-  fi
-
   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
 }
@@ -154,7 +146,7 @@ function _run_in_new_container
 
   ${CRI} run --rm "${USE_TTY}" \
     -v "${CONFIG_PATH}:${DMS_CONFIG}${USE_SELINUX}" \
-    "${IMAGE_NAME}" "${@:+$@}"
+    "${IMAGE_NAME}" "${@}"
 }
 
 function _main
@@ -213,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
@@ -234,14 +226,15 @@ function _main
 
   if [[ -n ${CONTAINER_NAME} ]]
   then
-    ${CRI} exec "${USE_TTY}" "${CONTAINER_NAME}" setup "${@:+$@}"
+    ${CRI} exec "${USE_TTY}" "${CONTAINER_NAME}" setup "${@}"
   else
-    _run_in_new_container setup "${@:+$@}"
+    _run_in_new_container setup "${@}"
   fi
 
-  [[ ${1} == 'help' ]] && _show_local_usage
+  [[ ${1:-} == 'help' ]] && _show_local_usage
 
   return 0
 }
 
-_main "${@:+$@}"
+[[ -z ${1:-} ]] && set 'help'
+_main "${@}"
diff --git a/songlify/docker-compose.yml b/songlify/docker-compose.yml
index 4ee7116..d0342c5 100644
--- a/songlify/docker-compose.yml
+++ b/songlify/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   bot:
-    image: polpetta/songlify:0.3.2
+    image: polpetta/songlify:0.3.4
     restart: always
     entrypoint: /usr/bin/songlify
     env_file:
-- 
2.40.1