From c9df02116b53a18d4e8d06f9c3e9892b2997f3ff Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:16:47 +0100 Subject: [PATCH] Revert --- .templates/00-global_var.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.templates/00-global_var.sh b/.templates/00-global_var.sh index f49f5bcde..d538ccc97 100755 --- a/.templates/00-global_var.sh +++ b/.templates/00-global_var.sh @@ -41,25 +41,18 @@ for KEYS in "${arr[@]}"; do ###################################### # Export the variable to run scripts # ###################################### - - # 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 # 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 $line" /etc/services.d/*/*run* 2>/dev/null; fi + if cat /etc/cont-init.d/*run* &>/dev/null; then sed -i "1a export $line" /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 + echo "export ${KEYS}=\"${VALUE}\"" >> ~/.bashrc done