diff options
| author | Tristan Sloughter <[email protected]> | 2016-08-24 12:44:03 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-08-24 12:44:03 -0700 |
| commit | 766a2fb0c1724193a5846c3baee5d7f17f343ac5 (patch) | |
| tree | 01840c574888ee84a7aaaa2e6cda7c5422e8dd81 /priv | |
| parent | f2877a2dc9513c7f98c8a962798379c5c89f4246 (diff) | |
| parent | 77b8e9202715d526b1bae06b4a8a7882e501dfdc (diff) | |
| download | relx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.tar.gz relx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.tar.bz2 relx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.zip | |
Merge pull request #479 from emtenet/add-boot-varv3.21.0
Fix for #478 Boot variable $ERTS_LIB_DIR not supplied in Windows scripts
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/bin_windows | 3 | ||||
| -rw-r--r-- | priv/templates/extended_bin_windows | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/priv/templates/bin_windows b/priv/templates/bin_windows index fa1c2cc..06303f5 100644 --- a/priv/templates/bin_windows +++ b/priv/templates/bin_windows @@ -34,7 +34,8 @@ cd %rootdir% @echo Rootdir=%converted_rootdir% >> "%erl_ini%" :: Start the release in an `erl` shell -@"%erl%" %erl_opts% %sys_config% -boot "%boot_script%" %* +@set boot=-boot "%boot_script%" -boot_var RELEASE_DIR "%release_root_dir%" +@"%erl%" %erl_opts% %sys_config% %boot% %* @goto :eof diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows index e5ab40a..d892ea6 100644 --- a/priv/templates/extended_bin_windows +++ b/priv/templates/extended_bin_windows @@ -186,7 +186,8 @@ set description=Erlang node %node_name% in %rootdir% :: Start a console :console -@start "%rel_name% console" %werl% -boot "%boot_script%" %sys_config% ^ +@set boot=-boot "%boot_script%" -boot_var RELEASE_DIR "%release_root_dir%" +@start "%rel_name% console" %werl% %boot% %sys_config% ^ -args_file "%vm_args%" @goto :eof @@ -202,6 +203,7 @@ set description=Erlang node %node_name% in %rootdir% :: Attach to a running node :attach -@start "%node_name% attach" %werl% -boot "%clean_boot_script%" ^ +@set boot=-boot "%clean_boot_script%" -boot_var RELEASE_DIR "%release_root_dir%" +@start "%node_name% attach" %werl% %boot% ^ -remsh %node_name% %node_type% console -setcookie %cookie% @goto :eof |