aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Petrovsky <[email protected]>2018-04-01 12:35:31 +0300
committerAlexander Petrovsky <[email protected]>2018-04-01 12:42:51 +0300
commit368832d66b856e8024664f1a8e6c69fe12f41433 (patch)
tree9c4691d076d58c7bf53c5f0f90e1c8ca5cddd75a
parentcfd62bfb8e29a8fdf8e32463b80c02fb71315559 (diff)
downloadrelx-368832d66b856e8024664f1a8e6c69fe12f41433.tar.gz
relx-368832d66b856e8024664f1a8e6c69fe12f41433.tar.bz2
relx-368832d66b856e8024664f1a8e6c69fe12f41433.zip
Reorder replace_os_vars and node NAME assignment
-rwxr-xr-xpriv/templates/extended_bin6
1 files changed, 3 insertions, 3 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 06fed1a..0381964 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -352,6 +352,9 @@ ERTS_LIB_DIR="$(dirname "$ERTS_DIR")/lib"
VMARGS_PATH=$(add_path vm.args $VMARGS_PATH)
+VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH)
+RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH)
+
# Check vm.args and other files referenced via -args_file parameters for:
# - nonexisting -args_files
# - circular dependencies of -args_files
@@ -437,9 +440,6 @@ esac
# Export the variable so that it's available in the 'eval' calls
export NAME
-VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH)
-RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH)
-
# Make sure log directory exists
mkdir -p "$RUNNER_LOG_DIR"