Skip to content

Commit

Permalink
don't use CONFIG_PATH os var, fixes #241
Browse files Browse the repository at this point in the history
  • Loading branch information
tsloughter committed Feb 1, 2015
1 parent 2eda48d commit 60dda02
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions priv/templates/extended_bin.dtl
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit 60dda02

Please sign in to comment.