From 70018651860cbd0dc3bb26fb6ba1e35867dda80f Mon Sep 17 00:00:00 2001
From: marcelhas <marcel.hasieber@gmail.com>
Date: Fri, 1 Oct 2021 10:33:35 +0200
Subject: [PATCH] Fix start scripts (#8005)

* fix(Bash): Handle missing env variable

Bash installation failed when no explicit `zipPath` was set.
As it defaulted to `/`, which led to permission errors.

* fix(Docker): Fix docker volume error

Docker installation failed, because target directories of volumes should
not end with a `/`.

https://stackoverflow.com/questions/68273745/how-to-make-a-mount-shared-in-docker/68455665#68455665
---
 apps/installer/includes/functions.sh | 2 +-
 docker-compose.yml                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh
index 186d2e747..cd4d746e5 100644
--- a/apps/installer/includes/functions.sh
+++ b/apps/installer/includes/functions.sh
@@ -227,7 +227,7 @@ function inst_download_client_data {
 
     # first check if it's defined in env, otherwise use the default
     local path="${DATAPATH:-$AC_BINPATH_FULL}"
-    local zipPath="${DATAPATH_ZIP:-"$DATAPATH/data.zip"}"
+    local zipPath="${DATAPATH_ZIP:-"$path/data.zip"}"
 
     dataVersionFile="$path/data-version"
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f245feaa7..006d64481 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
   abstract-bind:
     image: local/azerothcore/abstract-bind
     volumes:
-      - .:/azerothcore/
+      - .:/azerothcore
       # expose some dist folder outside allowing the host to use them
       - ${DOCKER_VOL_CONF:-./conf}:/azerothcore/conf
       - ${DOCKER_VOL_BIN:-ac-bin}:/azerothcore/env/dist/bin
@@ -45,7 +45,7 @@ services:
   abstract-no-bind:
     image: local/azerothcore/abstract-no-bind
     volumes:
-      - ac-proj:/azerothcore/
+      - ac-proj:/azerothcore
     profiles: [abstract-service] # do not run this
 
 #=======================