From f41846e9d6055193a72486c14a59e954765f5adb Mon Sep 17 00:00:00 2001 From: thelittlefireman Date: Fri, 5 Mar 2021 23:56:19 +0100 Subject: [PATCH 1/2] Fix env variable with space are truncated Fix #82 --- entrypoint/site-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint/site-config.sh b/entrypoint/site-config.sh index 949157e..c439565 100644 --- a/entrypoint/site-config.sh +++ b/entrypoint/site-config.sh @@ -26,12 +26,12 @@ if [ "$MULTISITE" = "yes" ] ; then sed -i "/^${server}_.*=.*/d" "${NGINX_PREFIX}nginx.env" fi done - for var in $(env) ; do - name=$(echo "$var" | cut -d '=' -f 1) + for var in $(compgen -e) ; do + name=$(echo "$var") check=$(echo "$name" | grep "^$1_") if [ "$check" != "" ] ; then repl_name=$(echo "$name" | sed "s~${1}_~~") - repl_value=$(echo "$var" | sed "s~${name}=~~") + repl_value=$(echo "${!var}") read -r "$repl_name" <<< $repl_value sed -i "/^${repl_name}=.*/d" "${NGINX_PREFIX}nginx.env" sed -i "/^${name}=.*/d" "${NGINX_PREFIX}nginx.env" From 66c4fed79137a8fbe3eed88f62215e3b55a6c5fc Mon Sep 17 00:00:00 2001 From: thelittlefireman Date: Fri, 5 Mar 2021 23:59:38 +0100 Subject: [PATCH 2/2] Fix env variable with space are truncated 2 Fix #82 --- entrypoint/utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint/utils.sh b/entrypoint/utils.sh index 87c436b..c6823f5 100644 --- a/entrypoint/utils.sh +++ b/entrypoint/utils.sh @@ -26,10 +26,10 @@ function has_value() { echo "ok" return 0 fi - for var in $(env) ; do + for var in $(compgen -e) ; do domain=$(echo "$var" | cut -d '_' -f 1) name=$(echo "$var" | cut -d '=' -f 1 | sed "s~${domain}_~~") - value=$(echo "$var" | sed "s~${domain}_${name}=~~") + value=$(echo "${!var}") if [ "$name" == "$1" ] && [ "$value" == "$2" ] ; then echo "ok" return 0