From f512334afb043461ebb6e43ca7d70d7713033416 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:54:16 +0100
Subject: [PATCH] Update 00-global_var.sh

---
 .templates/00-global_var.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.templates/00-global_var.sh b/.templates/00-global_var.sh
index ac029847a..f49f5bcde 100755
--- a/.templates/00-global_var.sh
+++ b/.templates/00-global_var.sh
@@ -44,19 +44,22 @@ for KEYS in "${arr[@]}"; do
 
     # Sanitize " ' ` in current variable
     VALUE="${VALUE//[\"\'\`]/}"
+    if [[ "$VALUE" = *" "* ]]; then
+        VALUE="'$VALUE'"
+    fi
     # Export
-    export "${KEYS}=\"${VALUE}\""
+    export "${KEYS}=${VALUE}"
     # set .env
-    echo "$KEYS=\"$VALUE\"" >> /.env || true
+    echo "$KEYS=$VALUE" >> /.env || true
     # set /etc/environment
     mkdir -p /etc
-    echo "$KEYS=\"$VALUE\"" >> /etc/environment
+    echo "$KEYS=$VALUE" >> /etc/environment
     # For non s6
-    if cat /etc/services.d/*/*run* &>/dev/null; then sed -i "1a export ${KEYS}=\"${VALUE}\"" /etc/services.d/*/*run* 2>/dev/null; fi
-    if cat /etc/cont-init.d/*run* &>/dev/null; then sed -i "1a export ${KEYS}=\"${VALUE}\"" /etc/cont-init.d/*run* 2>/dev/null; fi
+    if cat /etc/services.d/*/*run* &>/dev/null; then sed -i "1a export ${KEYS}=${VALUE}" /etc/services.d/*/*run* 2>/dev/null; fi
+    if cat /etc/cont-init.d/*run* &>/dev/null; then sed -i "1a export ${KEYS}=${VALUE}" /etc/cont-init.d/*run* 2>/dev/null; fi
     # For s6
-    if [ -d /var/run/s6/container_environment ]; then printf "%s" "\"${VALUE}\"" > /var/run/s6/container_environment/"${KEYS}"; fi
-    echo "export ${KEYS}=\"${VALUE}\"" >> ~/.bashrc
+    if [ -d /var/run/s6/container_environment ]; then printf "%s" "${VALUE}" > /var/run/s6/container_environment/"${KEYS}"; fi
+    echo "export ${KEYS}=${VALUE}" >> ~/.bashrc
 
 done