diff options
| author | Tristan Sloughter <[email protected]> | 2019-04-01 09:21:19 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-01 09:21:19 -0600 |
| commit | efdef34f8f896e450ac9665d529e0b690773df96 (patch) | |
| tree | 896a859bdcbcd5c769b9588d2a114bff5ee19426 | |
| parent | 46afa565c7b319d1a8b23a7583da9d1d5e1e02e1 (diff) | |
| download | relx-efdef34f8f896e450ac9665d529e0b690773df96.tar.gz relx-efdef34f8f896e450ac9665d529e0b690773df96.tar.bz2 relx-efdef34f8f896e450ac9665d529e0b690773df96.zip | |
use RELX_OUT_FILE_PATH even when generating from .src files (#700)
| -rwxr-xr-x | priv/templates/extended_bin | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 76d2d38..059f5bf 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -250,9 +250,9 @@ check_replace_os_vars() { SRC_FILE_PATH="$IN_FILE_PATH.src" ORIG_FILE_PATH="$IN_FILE_PATH.orig" if [ -f "$SRC_FILE_PATH" ]; then + OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH) 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 if [ -f "$ORIG_FILE_PATH" ]; then @@ -272,7 +272,8 @@ check_replace_os_vars() { else # If vm.arg.orig or sys.config.orig is present then use that if [ -f "$ORIG_FILE_PATH" ]; then - cp "$ORIG_FILE_PATH" "$OUT_FILE_PATH" + OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH) + cp "$ORIG_FILE_PATH" "$OUT_FILE_PATH" fi fi echo $OUT_FILE_PATH |