Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

This commit is contained in:
Brennan Kinney 2023-09-06 00:59:19 +12:00 committed by polarathene
parent b007533380
commit c811e6c854
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/scripts/helpers/utils.sh
View File

@ -154,9 +154,7 @@ function _env_var_expect_integer() {
return 1 return 1
} }
# Ensures that zenv only runs envsubst with ENV filtered from the provided prefix. # Replace `${VAR}` variables of the input file with their equivalent ENV values (excluding the common prefix)
# Those ENV are loaded by zenv in the format of an `.env` file (with prefix dropped by sed)
# When an ENV is not available, envsubst will evaluate it as empty.
# #
# @param ${1} = Use a prefix for a group of environment variables # @param ${1} = Use a prefix for a group of environment variables
# @param ${2} = Filepath to ENV template # @param ${2} = Filepath to ENV template
@ -169,6 +167,10 @@ function _template_with_env() {
_dms_panic__invalid_value "file '${ENV_TEMPLATE}' does not exist" 'utils.sh:_use_env_template' _dms_panic__invalid_value "file '${ENV_TEMPLATE}' does not exist" 'utils.sh:_use_env_template'
fi fi
# Ensures that zenv only runs envsubst with ENV filtered from the provided prefix.
# Those ENV are loaded by zenv in the format of an `.env` file (with prefix dropped by sed)
# When an ENV is not available, envsubst will evaluate it as empty.
#
# NOTE: $PATH is retained to avoid needing absolute paths for binaries. # NOTE: $PATH is retained to avoid needing absolute paths for binaries.
env --ignore-environment PATH="${PATH}" \ env --ignore-environment PATH="${PATH}" \
zenv --file <(env | grep "^${ENV_PREFIX}" | sed "s/^${ENV_PREFIX}//") \ zenv --file <(env | grep "^${ENV_PREFIX}" | sed "s/^${ENV_PREFIX}//") \