From 5352ac660b838fda49a4789623db92fd3045179a Mon Sep 17 00:00:00 2001 From: Ivaylo Badinov Date: Tue, 11 Jun 2019 16:54:45 +0300 Subject: Fix path variables quoting for Windows --- priv/templates/extended_bin_windows | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows index 394b352..09db216 100644 --- a/priv/templates/extended_bin_windows +++ b/priv/templates/extended_bin_windows @@ -41,12 +41,12 @@ @set vm_args=%rel_dir%\vm.args @set progname=erl.exe @set clean_boot_script=%release_root_dir%\bin\start_clean -@set "erlsrv=%bindir%\erlsrv.exe" -@set "epmd=%bindir%\epmd.exe" -@set "escript=%bindir%\escript.exe" -@set "werl=%bindir%\werl.exe" -@set "erl=%bindir%\erl.exe" -@set "nodetool=%release_root_dir%\bin\nodetool" +@set erlsrv="%bindir%\erlsrv.exe" +@set epmd="%bindir%\epmd.exe" +@set escript="%bindir%\escript.exe" +@set werl="%bindir%\werl.exe" +@set erl="%bindir%\erl.exe" +@set nodetool="%release_root_dir%\bin\nodetool" @set "extensions0={{ extensions }}" @set "extensions1=%extensions0:|= %" @set "extensions=%extensions1: undefined=%" @@ -159,7 +159,7 @@ @for /f "delims=" %%i in ('where erl') do @( set "erl=%%i" ) -@for /f "delims=" %%i in ('"%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop') do @( +@for /f "delims=" %%i in ('%erl% -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop') do @( set "erl_root=%%i" ) @set "erts_dir=%erl_root%\erts-%erts_vsn%" @@ -332,7 +332,7 @@ set description=Erlang node %node_name%%hostname% in %rootdir% :attach @set boot=-boot "%clean_boot_script%" -boot_var RELEASE_DIR "%release_root_dir%" @start "%node_name% attach" %werl% %boot% ^ - -remsh %node_name%%hostname% %node_type% console -setcookie %cookie% + -remsh "%node_name%%hostname%" %node_type% console -setcookie "%cookie%" @goto :eof :: Run extension script -- cgit v1.2.3 From 4d1076731feac906debfb5a529450e648d081fb4 Mon Sep 17 00:00:00 2001 From: Ivaylo Badinov Date: Wed, 12 Jun 2019 09:39:47 +0300 Subject: Cookie and hostname should not be quoted --- priv/templates/extended_bin_windows | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows index 09db216..fd899a4 100644 --- a/priv/templates/extended_bin_windows +++ b/priv/templates/extended_bin_windows @@ -320,7 +320,7 @@ set description=Erlang node %node_name%%hostname% in %rootdir% :: Ping the running node :ping -@%escript% %nodetool% ping %node_type% "%node_name%%hostname%" -setcookie "%cookie%" +@%escript% %nodetool% ping %node_type% %node_name%%hostname% -setcookie %cookie% @goto :eof :: List installed Erlang services @@ -332,7 +332,7 @@ set description=Erlang node %node_name%%hostname% in %rootdir% :attach @set boot=-boot "%clean_boot_script%" -boot_var RELEASE_DIR "%release_root_dir%" @start "%node_name% attach" %werl% %boot% ^ - -remsh "%node_name%%hostname%" %node_type% console -setcookie "%cookie%" + -remsh %node_name%%hostname% %node_type% console -setcookie %cookie% @goto :eof :: Run extension script -- cgit v1.2.3