From 69b26b35bfda82078704d924d76d7057e71b15b2 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 4 Jan 2025 20:30:12 +0100 Subject: [PATCH] - Remove .env.sed file obsoleted by ENV_SED environment variable. --- ReleaseNotes.txt | 6 ++++-- sbin/docker_mk_env | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 01da720..3256f4c 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,11 +1,13 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Docker Tools V 1.3.3 - A. GIBERT - 2025/01/04 +Rx3-Docker/Docker Tools V 1.3.3 - A. GIBERT - 2025/01/05 ------------------------------------------------------------------------------------------------------------------------------------ -- Add DOCKER_TOOLS_EXEPTION_LOGS env variable support. +- Add DOCKER_TOOLS_EXEPTION_LOGS env variable support, +- Remove .env.sed file obsoleted by ENV_SED environment variable. +------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Docker Tools V 1.3.2 - A. GIBERT - 2024/12/27 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/sbin/docker_mk_env b/sbin/docker_mk_env index cb71f80..54b362b 100755 --- a/sbin/docker_mk_env +++ b/sbin/docker_mk_env @@ -415,14 +415,16 @@ fi >${APPL_HOME_DIR}/.env ->${APPL_HOME_DIR}/.env.sed for var in $( ( grep "^ *[a-zA-Z0-9_-]*=" ${APPL_HOME_DIR}/env | sed -e "s/=.*//" -e "s/ *//"; echo ${DYNVAR_LIST} | sed -e 's/ /\n/g') | sort -u) do echo "${var}='${!var}'" >>${APPL_HOME_DIR}/.env - echo "s/\${${var}}/${!var//\//\\/}/g" >>${APPL_HOME_DIR}/.env.sed + ENV_SED="${ENV_SED}s/\${${var}}/${!var//\//\\/}/g +" done +echo ENV_SED=\'"${ENV_SED}"\' >>${APPL_HOME_DIR}/.env + for tupple in ${CONFIG_FILE_LIST} @@ -435,5 +437,5 @@ do IFS=" " - sed <${config_file_source} >${config_file_target} -f ${APPL_HOME_DIR}/.env.sed + sed <${config_file_source} >${config_file_target} -e "${ENV_SED}" done