From 0f987dde976b5147aeae5c5d03f90a6e39a5a5f2 Mon Sep 17 00:00:00 2001
From: SisMaker <1713699517@qq.com>
Date: Fri, 16 Oct 2020 23:06:14 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E9=81=BF=E5=85=8Dwin?=
 =?UTF-8?q?=E4=B8=8B=E9=80=92=E5=BD=92=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=AD=BB=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sync/esUtils.erl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl
index 593e97e..9dcfaa6 100644
--- a/src/sync/esUtils.erl
+++ b/src/sync/esUtils.erl
@@ -196,12 +196,18 @@ findIncludeDirFromAncestors(_, _, "/") -> undefined;
 findIncludeDirFromAncestors(_, _, ".") -> undefined;
 findIncludeDirFromAncestors(_, _, "") -> undefined;
 findIncludeDirFromAncestors(Cwd, IncludeBase, Dir) ->
-   AttemptDir = filename:join(filename:dirname(Dir), IncludeBase),
+   NewDirName = filename:dirname(Dir),
+   AttemptDir = filename:join(NewDirName, IncludeBase),
    case filelib:is_dir(AttemptDir) of
       true ->
          {ok, AttemptDir};
       false ->
-         findIncludeDirFromAncestors(Cwd, IncludeBase, filename:dirname(Dir))
+         case NewDirName =/= Dir of
+            true ->
+               findIncludeDirFromAncestors(Cwd, IncludeBase, NewDirName);
+            _ ->
+               undefined
+         end
    end.
 
 % normalizeCaseWindowsDir(Dir) ->
@@ -300,7 +306,7 @@ getSystemModules() ->
       eunit, gs, hipe, inets, inets, inviso, jinterface, kernel,
       mnesia, observer, orber, os_mon, parsetools, percept, pman,
       reltool, runtime_tools, sasl, snmp, ssl, stdlib, syntax_tools,
-      test_server, toolbar, tools, tv, webtool, wx, xmerl, zlib
+      test_server, toolbar, tools, tv, webtool, wx, xmerl, zlib, rebar, rebar3
    ],
    FAppMod =
       fun(App) ->