Skip to content

Commit b0dc9ad

Browse files
committedJun 25, 2015
Fix paths for symlinks
1 parent 1d29547 commit b0dc9ad

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed
 

‎rebar3

-4.31 KB
Binary file not shown.

‎rebar3.cmd

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
setlocal
3+
set rebarscript=%~f0
4+
escript.exe "%rebarscript:.cmd=%" %*

‎src/rlx_util.erl

+3-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ symlink_or_copy(Source, Target) ->
222222
{error, _} ->
223223
case os:type() of
224224
{win32, _} ->
225-
win32_symlink(Source, Target);
225+
S = unicode:characters_to_list(Source),
226+
T = unicode:characters_to_list(Target),
227+
win32_symlink(filename:nativename(S), filename:nativename(T));
226228
_ ->
227229
case filelib:is_dir(Target) of
228230
true -> ok;

‎test/rlx_command_SUITE.erl

+1-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ normal_passing_case(Config) ->
6262
{ok, {Opts, Targets}} = getopt:parse(relx:opt_spec_list(), CmdLine),
6363
{ok, State} = rlx_cmd_args:args2state(Opts, Targets),
6464
{ok, State1} = rlx_config:do(State),
65-
Overrides = rlx_state:overrides(State1),
66-
ct:pal("Overrides: ~p~n", [Overrides]),
67-
?assertMatch([{lib1,Lib1}], Overrides),
65+
?assertMatch([{lib1,Lib1}], rlx_state:overrides(State1)),
6866
?assertMatch([Lib1, Lib2],
6967
rlx_state:lib_dirs(State1)),
7068
?assertMatch(Outdir, rlx_state:base_output_dir(State1)),

0 commit comments

Comments
 (0)
Please sign in to comment.