From 08a5168b8fc95cf8084dc180d40329987ad2db80 Mon Sep 17 00:00:00 2001
From: bucde <bucde@b-eit.de>
Date: Thu, 23 Sep 2021 11:23:00 +0200
Subject: [PATCH] fix: add container name var to .env file in setup script

---
 setup | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setup b/setup
index f5dacf3..ef6dc47 100755
--- a/setup
+++ b/setup
@@ -15,7 +15,8 @@ echo ""
 DATE=$(date +'%y%m%d%H%M%S')
 
 CONFIG_EXISTS="false"
-KEEP_CONFIG=""
+USE_EXISTING_CONFIG=""
+DELETE_CONFIG=""
 
 MARIADB_CONTAINER_NAME="mariadb_$DATE"
 MARIADB_VERSION=""
@@ -25,18 +26,23 @@ MARIADB_ROOT_PASSWORD=""
 
 if [ -f ".env" ]; then
     CONFIG_EXISTS="true"
-    read -p "Config file '.env' already exists! Would you like to use this? (y/n)" KEEP_CONFIG
+    read -p "Config file '.env' already exists! Would you like to use this? (y/n)" USE_EXISTING_CONFIG
 fi
 
-if [ $CONFIG_EXISTS == "false" ] || [ $KEEP_CONFIG == "n" ]; then
+if [ $CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_CONFIG == "n" ]; then
     read -p "Enter mariadb container name suffix (leave empty for none): " MARIADB_CONTAINER_NAME_SUFFIX
     read -p "Enter mariadb version which should be used: " MARIADB_VERSION
     read -p "Enter host (vm) ip address on which mariadb should be accessible: " MARIADB_HOST_IP_ADDRESS
     read -p "Enter host (vm) port on which mariadb should be accessible: " MARIADB_HOST_PORT
     read -p "Enter root password for mariadb: " MARIADB_ROOT_PASSWORD
 
+    if [ -n "$MARIADB_CONTAINER_NAME_SUFFIX" ]; then
+        MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_CONTAINER_NAME_SUFFIX}"
+    fi
+
     rm -f .env
     touch .env
+    echo "MARIADB_CONTAINER_NAME="$MARIADB_CONTAINER_NAME >> .env
     echo "MARIADB_CONTAINER_NAME_SUFFIX="$MARIADB_CONTAINER_NAME_SUFFIX >> .env
     echo "MARIADB_VERSION="$MARIADB_VERSION >> .env
     echo "MARIADB_HOST_IP_ADDRESS="$MARIADB_HOST_IP_ADDRESS >> .env
@@ -44,9 +50,7 @@ if [ $CONFIG_EXISTS == "false" ] || [ $KEEP_CONFIG == "n" ]; then
     echo "MARIADB_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD >> .env
 fi
 
-if [ -n "$MARIADB_CONTAINER_NAME_SUFFIX" ]; then
-    MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_CONTAINER_NAME_SUFFIX}"
-fi
+read -p "Should the config file '.env' be deleted after creating the container? (y/n)" DELETE_CONFIG
 
 docker-compose up -d