From 457b73056b2629015f6c0bfab487abf976743925 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Fri, 16 Oct 2020 23:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sync/esUtils.erl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl index 9dcfaa6..08766a4 100644 --- a/src/sync/esUtils.erl +++ b/src/sync/esUtils.erl @@ -170,7 +170,7 @@ determineIncludeDir(IncludeDir, BeamDir, SrcDir) -> % Cwd2 = normalizeCaseWindowsDir(Cwd), % SrcDir2 = normalizeCaseWindowsDir(SrcDir), % IncludeBase2 = normalizeCaseWindowsDir(IncludeBase), - case findIncludeDirFromAncestors(Cwd, IncludeBase, SrcDir) of + case findIncludeDirFromAncestors(SrcDir, Cwd, IncludeBase) of {ok, D} -> {ok, D}; undefined -> {ok, IncludeDir} %% Failed, just stick with original end @@ -191,11 +191,11 @@ determineIncludeDirFromBeamDir(IncludeBase, IncludeDir, BeamDir) -> end. %% Then we dig back through the parent directories until we find our include directory -findIncludeDirFromAncestors(Cwd, _, Cwd) -> undefined; -findIncludeDirFromAncestors(_, _, "/") -> undefined; -findIncludeDirFromAncestors(_, _, ".") -> undefined; -findIncludeDirFromAncestors(_, _, "") -> undefined; -findIncludeDirFromAncestors(Cwd, IncludeBase, Dir) -> +findIncludeDirFromAncestors(Cwd, Cwd, _) -> undefined; +findIncludeDirFromAncestors("/", _, _) -> undefined; +findIncludeDirFromAncestors( ".", _, _) -> undefined; +findIncludeDirFromAncestors( "", _, _) -> undefined; +findIncludeDirFromAncestors(Dir, Cwd, IncludeBase) -> NewDirName = filename:dirname(Dir), AttemptDir = filename:join(NewDirName, IncludeBase), case filelib:is_dir(AttemptDir) of @@ -204,7 +204,7 @@ findIncludeDirFromAncestors(Cwd, IncludeBase, Dir) -> false -> case NewDirName =/= Dir of true -> - findIncludeDirFromAncestors(Cwd, IncludeBase, NewDirName); + findIncludeDirFromAncestors(NewDirName, Cwd, IncludeBase); _ -> undefined end