aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-05-05 18:16:38 +0200
committerJordan Wilberding <[email protected]>2014-05-05 18:16:38 +0200
commitb8ea30807fb0bb400b56d3f5f80d85e6c16ad1d3 (patch)
tree78594fb295106569e504c7a51e1bee721e8b7eb0
parentf094ac63047b03275a5745f81b89d006aa5ad0cf (diff)
parent7d1d81bee22a0a93f4f9590900ca9fcf81c3fd52 (diff)
downloadrelx-b8ea30807fb0bb400b56d3f5f80d85e6c16ad1d3.tar.gz
relx-b8ea30807fb0bb400b56d3f5f80d85e6c16ad1d3.tar.bz2
relx-b8ea30807fb0bb400b56d3f5f80d85e6c16ad1d3.zip
Merge pull request #174 from tsloughter/extended_script_config
fix comments for extended script search for vm.args and sys.config
-rw-r--r--priv/templates/extended_bin.dtl17
1 files changed, 4 insertions, 13 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index 26c18b6..807116b 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -54,34 +54,25 @@ relx_start_command() {
"$START_OPTION"
}
-# Use $CWD/vm.args if exists, otherwise releases/APP_VSN/vm.args, or else etc/vm.args
+# Use $CWD/vm.args if exists, otherwise releases/VSN/vm.args
if [ -z "$VMARGS_PATH" ]; then
if [ -f "$RELEASE_ROOT_DIR/vm.args" ]; then
VMARGS_PATH="$RELEASE_ROOT_DIR/vm.args"
USE_DIR="$RELEASE_ROOT_DIR"
else
- USE_DIR="$REL_DIR"
- if [ -f "$REL_DIR/vm.args" ]; then
- VMARGS_PATH="$REL_DIR/vm.args"
- else
- VMARGS_PATH="$REL_DIR/vm.args"
- fi
+ USE_DIR="$REL_DIR"
+ VMARGS_PATH="$REL_DIR/vm.args"
fi
fi
# Make sure log directory exists
mkdir -p "$RUNNER_LOG_DIR"
-# Use releases/VSN/sys.config if it exists otherwise use etc/app.config
if [ -z "$CONFIG_PATH" ]; then
if [ -f "$USE_DIR/sys.config" ]; then
CONFIG_PATH="$USE_DIR/sys.config"
else
- if [ -f "$REL_DIR/sys.config" ]; then
- CONFIG_PATH="$REL_DIR/sys.config"
- else
- CONFIG_PATH="$REL_DIR/app.config"
- fi
+ CONFIG_PATH="$REL_DIR/sys.config"
fi
fi