diff options
| author | Tristan Sloughter <[email protected]> | 2018-06-12 19:07:22 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-06-12 19:07:22 -0600 |
| commit | ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d (patch) | |
| tree | 5d37580d953db02cddfbf1821d3ba535677e3e1e /priv | |
| parent | 53f4c6eb6b57408a8b3cad412373db534a13ca1f (diff) | |
| download | relx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.tar.gz relx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.tar.bz2 relx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.zip | |
support for OTP21's sys.config.src file in releases (#647)
* support for OTP21's sys.config.src file in releases
* always replace os vars in .src files if found
* support vm_args_src to be consistent with sys_config_src
* add newlines after warning logs
* improve sys and vm src config tests
Diffstat (limited to 'priv')
| -rwxr-xr-x | priv/templates/extended_bin | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index dc01d5f..d044a38 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -263,8 +263,11 @@ add_path() { check_replace_os_vars() { IN_FILE_PATH=$(add_path $1 $2) OUT_FILE_PATH="$IN_FILE_PATH" + SRC_FILE_PATH="$IN_FILE_PATH.src" ORIG_FILE_PATH="$IN_FILE_PATH.orig" - if [ $RELX_REPLACE_OS_VARS ]; then + if [ -f "$SRC_FILE_PATH" ]; then + replace_os_vars "$SRC_FILE_PATH" "$OUT_FILE_PATH" + elif [ $RELX_REPLACE_OS_VARS ]; then # Create a new file in the same location as original OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH) # If vm.args.orig or sys.config.orig is present then use that |