Merge pull request #1692 from ferd/fix-bootstrap-repeat

Fix repeated bootstrap runs

1 files changed, 4 insertions, 3 deletions

diff --git a/bootstrap b/bootstrap
index 92933b6..a765ba1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -168,8 +168,9 @@ compile_file(File, Opts) ->
 bootstrap_rebar3() ->
     filelib:ensure_dir("_build/default/lib/rebar/ebin/dummy.beam"),
     code:add_path("_build/default/lib/rebar/ebin/"),
-    ok = symlink_or_copy(filename:absname("src"),
-                         filename:absname("_build/default/lib/rebar/src")),
+    Res = symlink_or_copy(filename:absname("src"),
+                          filename:absname("_build/default/lib/rebar/src")),
+    true = Res == ok orelse Res == exists,
     Sources = ["src/rebar_resource.erl" | filelib:wildcard("src/*.erl")],
     [compile_file(X, [{outdir, "_build/default/lib/rebar/ebin/"}
                      ,return | additional_defines()]) || X <- Sources],
@@ -648,4 +649,4 @@ join([H|T], Sep) ->
 chr(S, C) when is_integer(C) -> chr(S, C, 1).
 chr([C|_Cs], C, I) -> I;
 chr([_|Cs], C, I) -> chr(Cs, C, I+1);
-chr([], _C, _I) -> 0.
\ No newline at end of file
+chr([], _C, _I) -> 0.