Merge branch 'develop' into 'main'

Merging develop into main

See merge request !42

run/scripts/run

@@ -9,6 +9,19 @@ if [[ "$L3D_CONFIG" != "[]" ]]; then
     export PHP_VERSION=$V
   fi
 fi
+if [[ "$L3D_COMPOSE" != "[]" ]]; then
+  V=$(yq .name $L3D_COMPOSE)
+  if [[ "$V" != "null" ]]; then
+    export COMPOSE_PROJECT_NAME=$V
+  fi
+  if [[ ! -n ${PHP_VERSION} ]]; then
+    V=$(yq .services.php.image $L3D_COMPOSE | cut -d':' -f 2)
+    if [[ "$V" != "null" ]]; then
+      export PHP_VERSION=$V
+    fi
+  fi
+  rm "$L3D_COMPOSE"
+fi
 
 COMMAND=start
 if [[ -n "$1" ]]; then

run/scripts/start

 #!/bin/bash
 
 function getConfig() {
-  if [[ "$L3D_COMPOSE" != "[]" ]]; then
-    V=$(yq .name $L3D_COMPOSE)
-    if [[ "$V" != "null" ]]; then
-      COMPOSE_PROJECT_NAME=$V
-    fi
-    V=$(yq .services.php.image $L3D_COMPOSE | cut -d':' -f 2)
-    if [[ "$V" != "null" ]]; then
-      PHP_VERSION=$V
-    fi
-    rm "$L3D_COMPOSE"
-  fi
   if [[ ! -n ${PHP_VERSION} ]]; then
     while true; do
       DEFAULT=8.2
@@ -71,6 +60,7 @@ function startContainer() {
         --env L3DSHELL=${L3DSHELL}
         --env L3D_ALWAYS_CLEANUP=${L3D_ALWAYS_CLEANUP}
         --env HOME=/home/${USERNAME}
+        --env USERNAME=${USERNAME}
         --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
         --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
         --env PHP_VERSION=${PHP_VERSION}