diff options
| -rw-r--r-- | priv/templates/extended_bin_windows | 16 | ||||
| -rw-r--r-- | src/rlx_prv_app_discover.erl | 8 |
2 files changed, 15 insertions, 9 deletions
diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows index 5d59ccd..9425c4e 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%" @@ -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 diff --git a/src/rlx_prv_app_discover.erl b/src/rlx_prv_app_discover.erl index d58cf71..4ef7efc 100644 --- a/src/rlx_prv_app_discover.erl +++ b/src/rlx_prv_app_discover.erl @@ -132,7 +132,13 @@ add_system_lib_dir(State) -> add_environment_lib_dir(_State) -> case os:getenv("ERL_LIBS") of false -> []; - Libs -> [erlang:iolist_to_binary(L) || L <- rlx_string:lexemes(Libs, ":")] + Libs -> + Delim = + case os:type() of + {win32,_} -> ";"; + _ -> ":" + end, + [erlang:iolist_to_binary(L) || L <- rlx_string:lexemes(Libs, Delim)] end. %% Order matters so this slow dedup needs to be used |