diff options
| author | Tristan Sloughter <[email protected]> | 2013-09-23 14:05:55 -0700 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2013-09-23 14:05:55 -0700 |
| commit | 8a60327694646893729cde1708be4f507beceae0 (patch) | |
| tree | 661b5ca873c1f84714f259f4f5e6b780c59ff526 /src | |
| parent | ca0370134cea77ea91555db136d6a144bb1b78c6 (diff) | |
| parent | 4a1ef26bf942c71df3c9fdd907546063818144b2 (diff) | |
| download | relx-8a60327694646893729cde1708be4f507beceae0.tar.gz relx-8a60327694646893729cde1708be4f507beceae0.tar.bz2 relx-8a60327694646893729cde1708be4f507beceae0.zip | |
Merge pull request #51 from nevar/fix_vm_args
Fix search of vm.args
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_prv_assembler.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index a61d557..27dd3c1 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -679,9 +679,9 @@ find_sys_config() { } # Use $CWD/vm.args if exists, otherwise releases/APP_VSN/vm.args, or else etc/vm.args -if [ -e \"$CALLER_DIR/vm.args\" ]; then - VMARGS_PATH=$CALLER_DIR/vm.args - USE_DIR=$CALLER_DIR +if [ -e \"$RELEASE_ROOT_DIR/vm.args\" ]; then + VMARGS_PATH=$RELEASE_ROOT_DIR/vm.args + USE_DIR=$RELEASE_ROOT_DIR else USE_DIR=$REL_DIR if [ -e \"$REL_DIR/vm.args\" ]; then |