github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-15 11:09:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Quote paths before passing them to the shell

Browse source
This commit is contained in:
Jan Klötzke 2011-08-25 19:55:26 +02:00 committed by Tuncer Ayaz
parent 3ceabfa47c
commit 3fa6f6ab7c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/rebar_file_utils.erl
View file

@ -43,7 +43,9 @@
rm_rf(Target) -> rm_rf(Target) ->
case os:type() of case os:type() of
{unix, _} -> {unix, _} ->
{ok, []} = rebar_utils:sh(?FMT("rm -rf ~s", [Target]), EscTarget = re:replace(Target, " ", "\\\\ ",
[global, {return, list}]),
{ok, []} = rebar_utils:sh(?FMT("rm -rf ~s", [EscTarget]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
ok; ok;
{win32, _} -> {win32, _} ->
@ -60,7 +62,8 @@ cp_r(Sources, Dest) ->
case os:type() of case os:type() of
{unix, _} -> {unix, _} ->
SourceStr = string:join(Sources, " "), SourceStr = string:join(Sources, " "),
{ok, []} = rebar_utils:sh(?FMT("cp -R ~s ~s", [SourceStr, Dest]), {ok, []} = rebar_utils:sh(?FMT("cp -R \"~s\" \"~s\"",
[SourceStr, Dest]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
ok; ok;
{win32, _} -> {win32, _} ->
@ -72,12 +75,12 @@ cp_r(Sources, Dest) ->
mv(Source, Dest) -> mv(Source, Dest) ->
case os:type() of case os:type() of
{unix, _} -> {unix, _} ->
{ok, []} = rebar_utils:sh(?FMT("mv ~s ~s", [Source, Dest]), {ok, []} = rebar_utils:sh(?FMT("mv \"~s\" \"~s\"", [Source, Dest]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
ok; ok;
{win32, _} -> {win32, _} ->
{ok, R} = rebar_utils:sh( {ok, R} = rebar_utils:sh(
?FMT("cmd " "/c move /y ~s ~s 1> nul", ?FMT("cmd " "/c move /y \"~s\" \"~s\" 1> nul",
[filename:nativename(Source), [filename:nativename(Source),
filename:nativename(Dest)]), filename:nativename(Dest)]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
@ -110,14 +113,14 @@ delete_each([File | Rest]) ->
delete_each_dir_win32([]) -> ok; delete_each_dir_win32([]) -> ok;
delete_each_dir_win32([Dir | Rest]) -> delete_each_dir_win32([Dir | Rest]) ->
{ok, []} = rebar_utils:sh(?FMT("cmd /c rd /q /s ~s", {ok, []} = rebar_utils:sh(?FMT("cmd /c rd /q /s \"~s\"",
[filename:nativename(Dir)]), [filename:nativename(Dir)]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
delete_each_dir_win32(Rest). delete_each_dir_win32(Rest).
xcopy_win32(Source,Dest)-> xcopy_win32(Source,Dest)->
{ok, R} = rebar_utils:sh( {ok, R} = rebar_utils:sh(
?FMT("cmd /c xcopy ~s ~s /q /y /e 2> nul", ?FMT("cmd /c xcopy \"~s\" \"~s\" /q /y /e 2> nul",
[filename:nativename(Source), filename:nativename(Dest)]), [filename:nativename(Source), filename:nativename(Dest)]),
[{use_stdout, false}, return_on_error]), [{use_stdout, false}, return_on_error]),
case length(R) > 0 of case length(R) > 0 of