diff options
Diffstat (limited to 'priv/templates/extended_bin')
| -rwxr-xr-x | priv/templates/extended_bin | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 2cd6d29..7e6dd29 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -170,7 +170,7 @@ relx_rem_sh() { # Setup remote shell command to control node exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \ - -setcookie "$COOKIE" -hidden -kernel net_ticktime $TICKTIME $VM_ARGS + -setcookie "$COOKIE" -hidden -kernel net_ticktime $TICKTIME } # Generate a random id @@ -182,9 +182,7 @@ relx_gen_id() { relx_nodetool() { command="$1"; shift - ESCRIPT_TMP=$(escript_emulator_args_tmp $ROOTDIR/bin/nodetool) - - "$ERTS_DIR/bin/escript" "$ESCRIPT_TMP" "$NAME_TYPE" "$NAME" \ + "$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \ -setcookie "$COOKIE" "$command" $@ } @@ -233,41 +231,6 @@ replace_os_vars() { }1' < "$1" > "$2" } -escript_emulator_args() { - if [ -n "${VM_ARGS}" ]; then - if grep -q '%%!' $1; then - cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s| ${VM_ARGS}||'" $1) - eval "$cmd" - cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1) - eval "$cmd" - rm ${1}.prev - else - cmd=$(echo sed -i"'.prev'" "'/#!.*/ a \\ -%%! ${VM_ARGS}\n'" $1) - eval "$cmd" - rm ${1}.prev - fi - fi -} - -escript_emulator_args_tmp() { - # - # If the user provided $ROOTDIR/tmp directory then don't override - # original files of the package but use temporary files instead - # - local TMP_DIR="$ROOTDIR/tmp"; - - if [ -d "$TMP_DIR" ] && [ -w "$TMP_DIR" ]; then - local TMP_FILE="$TMP_DIR/$(basename $1)" - cp $1 $TMP_FILE - escript_emulator_args $TMP_FILE - echo $TMP_FILE - else - escript_emulator_args $1 - echo $1 - fi -} - add_path() { # Use $CWD/$1 if exists, otherwise releases/VSN/$1 IN_FILE_PATH=$2 @@ -649,9 +612,7 @@ case "$1" in relx_run_hooks "$PRE_INSTALL_UPGRADE_HOOKS" - ESCRIPT_TMP=$(escript_emulator_args_tmp $ROOTDIR/bin/install_upgrade.escript) - - exec "$BINDIR/escript" "$ESCRIPT_TMP" \ + exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \ "$COMMAND" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@" relx_run_hooks "$POST_INSTALL_UPGRADE_HOOKS" @@ -665,10 +626,8 @@ case "$1" in fi COMMAND="$1"; shift - - ESCRIPT_TMP=$(escript_emulator_args_tmp $ROOTDIR/bin/install_upgrade.escript) - exec "$BINDIR/escript" "$ESCRIPT_TMP" \ + exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \ "versions" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@" ;; |