diff options
| author | Luis Rascão <[email protected]> | 2018-04-11 09:54:08 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-11 09:54:08 +0100 |
| commit | ca7af42be3558128e1d6b9bed7275aaed7985b5a (patch) | |
| tree | 9c4691d076d58c7bf53c5f0f90e1c8ca5cddd75a | |
| parent | 9c0a70d9ff607cea5c587677dca53d8275f0a73b (diff) | |
| parent | 368832d66b856e8024664f1a8e6c69fe12f41433 (diff) | |
| download | relx-ca7af42be3558128e1d6b9bed7275aaed7985b5a.tar.gz relx-ca7af42be3558128e1d6b9bed7275aaed7985b5a.tar.bz2 relx-ca7af42be3558128e1d6b9bed7275aaed7985b5a.zip | |
Merge pull request #644 from juise/fix-sed-backup
Fix backup file creation by sed
| -rwxr-xr-x | priv/templates/extended_bin | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index daa071b..0381964 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -233,14 +233,16 @@ replace_os_vars() { escript_emulator_args() { if [ -n "${VM_ARGS}" ]; then if grep -q '%%!' $1; then - cmd=$(echo sed -i"' '" "'/%%!.*/ s| ${VM_ARGS}||'" $1) + cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s| ${VM_ARGS}||'" $1) eval "$cmd" - cmd=$(echo sed -i"' '" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1) + cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1) eval "$cmd" + rm ${1}.prev else - cmd=$(echo sed -i"' '" "'/#!.*/ a \\ + cmd=$(echo sed -i"'.prev'" "'/#!.*/ a \\ %%! ${VM_ARGS}\n'" $1) eval "$cmd" + rm ${1}.prev fi fi } @@ -350,6 +352,9 @@ ERTS_LIB_DIR="$(dirname "$ERTS_DIR")/lib" VMARGS_PATH=$(add_path vm.args $VMARGS_PATH) +VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH) +RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH) + # Check vm.args and other files referenced via -args_file parameters for: # - nonexisting -args_files # - circular dependencies of -args_files @@ -435,9 +440,6 @@ esac # Export the variable so that it's available in the 'eval' calls export NAME -VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH) -RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH) - # Make sure log directory exists mkdir -p "$RUNNER_LOG_DIR" |