From fcccfad04a7723b87db282bfaabf23b23e789f01 Mon Sep 17 00:00:00 2001
From: Flo <florian_feistel@outlook.de>
Date: Sat, 21 Dec 2024 02:46:28 +0100
Subject: [PATCH] __devenv

---
 bin/dcom | 11 +++++++++++
 up       |  7 -------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/dcom b/bin/dcom
index df5ce05..c34d35b 100644
--- a/bin/dcom
+++ b/bin/dcom
@@ -38,9 +38,11 @@ dcom() {
   fi
   
   SYSTEM_PATH="$ENV_DIR/systems/$SYSTEM_PATH"
+  SYSTEM_ENV_FILE="$SYSTEM_PATH/.env"
   DOCKER_COMPOSE_COMMAND="$@"
   DOCKER_COMPOSE_FILE="$SYSTEM_PATH/docker/docker-compose.yml"
   
+  # Set .env variables if a file exist
   if [[ ! -f "$DOCKER_COMPOSE_FILE" ]]; then
     denv_error_msg "$DOCKER_COMPOSE_FILE was not found. Have you run init yet?"
     return 1
@@ -49,5 +51,14 @@ dcom() {
   denv_info_msg "System: $SYSTEM_IDENTIFIER"
   denv_info_msg "Command: $DOCKER_COMPOSE_COMMAND"
 
+  if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
+    export $(grep -v '^#' "$SYSTEM_ENV_FILE" | xargs)
+  fi
+
   docker compose -f "$DOCKER_COMPOSE_FILE" $DOCKER_COMPOSE_COMMAND
+
+  # Unset .env variables if a file exist
+  if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
+    unset $(grep -v '^#' "$SYSTEM_ENV_FILE" | sed -E 's/(.*)=.*/\1/' | xargs)
+  fi
 }
\ No newline at end of file
diff --git a/up b/up
index a03fcb6..e69de29 100755
--- a/up
+++ b/up
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $SCRIPT_DIR/bin/drun
-
-docker compose -f "$SCRIPT_DIR/docker/docker-compose.yml" up -d
-$SCRIPT_DIR/bin/script/foreachSystem up -d