浏览代码

fileSync 执行文件目录修正

master
SisMaker 4 年前
父节点
当前提交
737b3c15ba
共有 2 个文件被更改,包括 18 次插入3 次删除
  1. +4
    -2
      src/sync/esSyncSrv.erl
  2. +14
    -1
      src/sync/esUtils.erl

+ 4
- 2
src/sync/esSyncSrv.erl 查看文件

@ -205,9 +205,11 @@ handle_info(doAfter, State) ->
spawn(fun() -> spawn(fun() ->
case os:type() of case os:type() of
{win32, _Osname} -> {win32, _Osname} ->
os:cmd("start ./priv/fileSync.exe ./ " ++ integer_to_list(ListenPort));
CmtStr = "start " ++ esUtils:fileSyncPath("fileSync.exe") ++ " ./ " ++ integer_to_list(ListenPort),
os:cmd(CmtStr);
_ -> _ ->
os:cmd("./priv/fileSync ./ " ++ integer_to_list(ListenPort))
CmtStr = esUtils:fileSyncPath("fileSync") ++ " ./ " ++ integer_to_list(ListenPort),
os:cmd(CmtStr)
end end), end end),
erlang:send_after(4000, self(), waitConnOver), erlang:send_after(4000, self(), waitConnOver),
{noreply, State#state{sockMod = SockMod}}; {noreply, State#state{sockMod = SockMod}};

+ 14
- 1
src/sync/esUtils.erl 查看文件

@ -870,4 +870,17 @@ addNewFile([OneFile | LeftFile], SrcFiles) ->
addNewFile(LeftFile, SrcFiles); addNewFile(LeftFile, SrcFiles);
_ -> _ ->
addNewFile(LeftFile, SrcFiles#{OneFile => 1}) addNewFile(LeftFile, SrcFiles#{OneFile => 1})
end.
end.
fileSyncPath(ExecName) ->
case code:priv_dir(?MODULE) of
{error, _} ->
case code:which(?MODULE) of
Filename when is_list(Filename) ->
filename:join([filename:dirname(filename:dirname(Filename)), "priv", ExecName]);
_ ->
filename:join("../priv", ExecName)
end;
Dir ->
filename:join(Dir, ExecName)
end.

正在加载...
取消
保存