diff options
| author | Jordan Wilberding <[email protected]> | 2015-02-01 09:05:34 -0800 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2015-02-01 09:05:34 -0800 |
| commit | 3b6ff4aee99e154f6b5a19e14dfa8870b0de6889 (patch) | |
| tree | 0bd50b5fa231b3bcdf8481d708f6c6f6daaafdad /priv/templates | |
| parent | 2eda48dd5f69f617a3e4b6f7de2d6d7c12d4e820 (diff) | |
| parent | 60dda02625d96c0473dcd03ecf1cea2c1600af18 (diff) | |
| download | relx-3b6ff4aee99e154f6b5a19e14dfa8870b0de6889.tar.gz relx-3b6ff4aee99e154f6b5a19e14dfa8870b0de6889.tar.bz2 relx-3b6ff4aee99e154f6b5a19e14dfa8870b0de6889.zip | |
Merge pull request #309 from tsloughter/master
don't use CONFIG_PATH os var, fixes #241
Diffstat (limited to 'priv/templates')
| -rw-r--r-- | priv/templates/extended_bin.dtl | 14 |
1 files changed, 7 insertions, 7 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" |