Merge remote-tracking branch 'origin/fix/v4.3.14' into rebuild-v4.3.14
This commit is contained in:
commit
fbdcc243a3
|
@ -266,18 +266,20 @@ unpack_zipballs(RelNameStr, Version) ->
|
||||||
GzFile = filename:absname(filename:join(["releases", RelNameStr ++ "-" ++ Version ++ ".tar.gz"])),
|
GzFile = filename:absname(filename:join(["releases", RelNameStr ++ "-" ++ Version ++ ".tar.gz"])),
|
||||||
ZipFiles = filelib:wildcard(filename:join(["releases", RelNameStr ++ "-*" ++ Version ++ "*.zip"])),
|
ZipFiles = filelib:wildcard(filename:join(["releases", RelNameStr ++ "-*" ++ Version ++ "*.zip"])),
|
||||||
?INFO("unzip ~p", [ZipFiles]),
|
?INFO("unzip ~p", [ZipFiles]),
|
||||||
[begin
|
lists:foreach(
|
||||||
TmdTarD="/tmp/emqx_untar_" ++ integer_to_list(erlang:system_time()),
|
fun(Zip) ->
|
||||||
|
TmdTarD = "/tmp/emqx_untar_" ++ integer_to_list(erlang:system_time()),
|
||||||
ok = filelib:ensure_dir(filename:join([TmdTarD, "dummy"])),
|
ok = filelib:ensure_dir(filename:join([TmdTarD, "dummy"])),
|
||||||
{ok, _} = file:copy(Zip, filename:join([TmdTarD, "emqx.zip"])),
|
{ok, _} = file:copy(Zip, filename:join([TmdTarD, "emqx.zip"])),
|
||||||
ok = file:set_cwd(filename:join([TmdTarD])),
|
ok = file:set_cwd(filename:join([TmdTarD])),
|
||||||
{ok, _FileList} = zip:unzip("emqx.zip"),
|
{ok, _FileList} = zip:unzip("emqx.zip"),
|
||||||
ok = file:set_cwd(filename:join([TmdTarD, "emqx"])),
|
ok = file:set_cwd(filename:join([TmdTarD, "emqx"])),
|
||||||
ok = erl_tar:create(GzFile, filelib:wildcard("*"), [compressed])
|
ok = erl_tar:create(GzFile, filelib:wildcard("*"), [compressed])
|
||||||
end || Zip <- ZipFiles]
|
end,
|
||||||
|
ZipFiles)
|
||||||
after
|
after
|
||||||
% restore cwd
|
% restore cwd
|
||||||
file:set_cwd(Cwd)
|
ok = file:set_cwd(Cwd)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
first_value(_Fun, []) -> no_value;
|
first_value(_Fun, []) -> no_value;
|
||||||
|
|
Loading…
Reference in New Issue