From 4ea2c2de74e72782649c77fe83f6e82bef7b12e1 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Mon, 3 Nov 2014 13:59:20 -0500 Subject: Fix *bin_windows.dtl boot script path In order to make it work with both compressed and uncompressed releases --- priv/templates/extended_bin_windows.dtl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'priv/templates/extended_bin_windows.dtl') diff --git a/priv/templates/extended_bin_windows.dtl b/priv/templates/extended_bin_windows.dtl index 1f94675..26340a4 100644 --- a/priv/templates/extended_bin_windows.dtl +++ b/priv/templates/extended_bin_windows.dtl @@ -29,11 +29,11 @@ @call :find_erts_dir @call :find_sys_config +@call :set_boot_script_var @set bindir=%erts_dir%\bin @set vm_args=%rel_dir%\vm.args @set progname=erl.exe -@set boot_script=%rel_dir%\%rel_name% @set clean_boot_script=%release_root_dir%\bin\start_clean @set erlsrv="%bindir%\erlsrv.exe" @set epmd="%bindir%\epmd.exe" @@ -55,11 +55,6 @@ :: Write the erl.ini file to set up paths relative to this script @call :write_ini -:: If a start.boot file is not present, copy one from the named .boot file -@if not exist "%rel_dir%\start.boot" ( - @copy "%rel_dir%\%rel_name%.boot" "%rel_dir%\start.boot" >nul -) - @if "%1"=="install" @goto install @if "%1"=="uninstall" @goto uninstall @if "%1"=="start" @goto start @@ -111,6 +106,15 @@ ) @goto :eof +:: set boot_script variable +:set_boot_script_var +@if exist "%rel_dir%\%rel_name%.boot" ( + @set boot_script=%rel_dir%\%rel_name% +) else ( + @set boot_script=%rel_dir%\start +) +@goto :eof + :: Write the erl.ini file :write_ini @set erl_ini=%erts_dir%\bin\erl.ini -- cgit v1.2.3