diff options
| -rw-r--r-- | priv/templates/extended_bin.dtl | 14 | ||||
| -rw-r--r-- | src/rlx_cmd_args.erl | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl index 005475a..ffff615 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -99,17 +99,17 @@ fi # Make sure log directory exists mkdir -p "$RUNNER_LOG_DIR" -if [ -z "$CONFIG_PATH" ]; then +if [ -z "$RELX_CONFIG_PATH" ]; then if [ -f "$USE_DIR/sys.config" ]; then - CONFIG_PATH="$USE_DIR/sys.config" + RELX_CONFIG_PATH="$USE_DIR/sys.config" else - CONFIG_PATH="$REL_DIR/sys.config" + RELX_CONFIG_PATH="$REL_DIR/sys.config" fi fi if [ $RELX_REPLACE_OS_VARS ]; then - awk '{while(match($0,"[$]{[^}]*}")) {var=substr($0,RSTART+2,RLENGTH -3);gsub("[$]{"var"}",ENVIRON[var])}}1' < $CONFIG_PATH > $CONFIG_PATH.2.config - CONFIG_PATH=$CONFIG_PATH.2.config + awk '{while(match($0,"[$]{[^}]*}")) {var=substr($0,RSTART+2,RLENGTH -3);gsub("[$]{"var"}",ENVIRON[var])}}1' < $RELX_CONFIG_PATH > $RELX_CONFIG_PATH.2.config + RELX_CONFIG_PATH=$RELX_CONFIG_PATH.2.config fi # Extract the target node name from node.args @@ -345,7 +345,7 @@ case "$1" in # Build it here because this command will be used for logging. set -- "$BINDIR/erlexec" -boot "$BOOTFILE" \ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \ - -env ERL_LIBS "$REL_DIR/lib" -config "$CONFIG_PATH" \ + -env ERL_LIBS "$REL_DIR/lib" -config "$RELX_CONFIG_PATH" \ -args_file "$VMARGS_PATH" # Dump environment info for logging purposes @@ -380,7 +380,7 @@ case "$1" in # Build an array of arguments to pass to exec later on # Build it here because this command will be used for logging. set -- "$BINDIR/erlexec" $FOREGROUNDOPTIONS \ - -boot "$REL_DIR/$BOOTFILE" -mode "$CODE_LOADING_MODE" -config "$CONFIG_PATH" \ + -boot "$REL_DIR/$BOOTFILE" -mode "$CODE_LOADING_MODE" -config "$RELX_CONFIG_PATH" \ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \ -args_file "$VMARGS_PATH" diff --git a/src/rlx_cmd_args.erl b/src/rlx_cmd_args.erl index 20ea3a9..2039b43 100644 --- a/src/rlx_cmd_args.erl +++ b/src/rlx_cmd_args.erl @@ -102,7 +102,7 @@ handle_config(Opts, Targets, CommandLineConfig) -> end end. --spec convert_targets([string()]) -> {ok, release | relup} | relx:error(). +-spec convert_targets([string()]) -> {ok, [rlx_state:action()]} | relx:error(). convert_targets(Targets) -> convert_targets(Targets, []). @@ -111,7 +111,7 @@ convert_targets(Targets) -> convert_targets([], []) -> {ok, [release]}; convert_targets([], Acc) -> - {ok, Acc}; + {ok, lists:reverse(Acc)}; convert_targets(["release" | T], Acc) -> convert_targets(T, [release | Acc]); convert_targets(["relup" | T], Acc) -> |