diff options
| author | Tristan Sloughter <[email protected]> | 2015-09-16 17:44:10 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2015-09-16 17:44:10 -0500 |
| commit | 3dd5ab0ad5fd1f60dbab136104b82ef8558dc33a (patch) | |
| tree | 2db2c09c389b4c0a7af9d6c12b60300c883fc64a | |
| parent | 979766f0f57730af8cea94aa23947026af77f286 (diff) | |
| parent | f63d3ad3f42f4b6fc1cab196e19ddc98ba58e9b6 (diff) | |
| download | relx-3dd5ab0ad5fd1f60dbab136104b82ef8558dc33a.tar.gz relx-3dd5ab0ad5fd1f60dbab136104b82ef8558dc33a.tar.bz2 relx-3dd5ab0ad5fd1f60dbab136104b82ef8558dc33a.zip | |
Merge pull request #390 from priestjim/feature/startup-script-fixes
Startup script improvements
| -rwxr-xr-x | priv/templates/bin | 8 | ||||
| -rwxr-xr-x | priv/templates/extended_bin | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/priv/templates/bin b/priv/templates/bin index 8e3f497..3067259 100755 --- a/priv/templates/bin +++ b/priv/templates/bin @@ -2,8 +2,12 @@ set -e -SCRIPT_DIR="$(dirname "$0")" -RELEASE_ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT=$(readlink $0) +if [ -z $SCRIPT ]; then + SCRIPT=$0 +fi; +SCRIPT_DIR="$(cd `dirname "$SCRIPT"` && pwd -P)" +RELEASE_ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd -P)" REL_NAME="{{ rel_name }}" REL_VSN="{{ rel_vsn }}" ERTS_VSN="{{ erts_vsn }}" diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 5cd8035..1d4da54 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -2,8 +2,12 @@ set -e -SCRIPT_DIR="$(dirname "$0")" -RELEASE_ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT=$(readlink $0) +if [ -z $SCRIPT ]; then + SCRIPT=$0 +fi; +SCRIPT_DIR="$(cd `dirname "$SCRIPT"` && pwd -P)" +RELEASE_ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd -P)" REL_NAME="{{ rel_name }}" REL_VSN="{{ rel_vsn }}" ERTS_VSN="{{ erts_vsn }}" @@ -89,9 +93,7 @@ relx_start_command() { 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" VMARGS_PATH="$REL_DIR/vm.args" fi fi @@ -104,9 +106,10 @@ fi # Make sure log directory exists mkdir -p "$RUNNER_LOG_DIR" +# Use $CWD/sys.config if exists, otherwise releases/VSN/sys.config if [ -z "$RELX_CONFIG_PATH" ]; then - if [ -f "$USE_DIR/sys.config" ]; then - RELX_CONFIG_PATH="$USE_DIR/sys.config" + if [ -f "$RELEASE_ROOT_DIR/sys.config" ]; then + RELX_CONFIG_PATH="$RELEASE_ROOT_DIR/sys.config" else RELX_CONFIG_PATH="$REL_DIR/sys.config" fi |