From 8f565ebe647370d413da07dc366ee10565358959 Mon Sep 17 00:00:00 2001 From: konyaris Date: Thu, 22 Mar 2018 12:47:33 +0100 Subject: Extend adding extra args from vm.args to install_upgrade.escript --- priv/templates/extended_bin | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'priv') diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 1e8aa63..daa071b 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -233,7 +233,9 @@ 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"' '" "'/%%!.*/ s| ${VM_ARGS}||'" $1) + eval "$cmd" + cmd=$(echo sed -i"' '" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1) eval "$cmd" else cmd=$(echo sed -i"' '" "'/#!.*/ a \\ @@ -579,6 +581,8 @@ case "$1" in relx_run_hooks "$PRE_INSTALL_UPGRADE_HOOKS" + escript_emulator_args $ROOTDIR/bin/install_upgrade.escript + exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \ "$COMMAND" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@" @@ -593,6 +597,8 @@ case "$1" in fi COMMAND="$1"; shift + + escript_emulator_args $ROOTDIR/bin/install_upgrade.escript exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \ "versions" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@" -- cgit v1.2.3