Merge pull request #7702 from savonarola/fix-install_upgrade

fix(install_upgrade): fix unpack_zipballs return value
This commit is contained in:
Zaiming (Stone) Shi 2022-04-21 10:05:14 +01:00 committed by GitHub
commit ec80a05a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions

View File

@ -266,7 +266,8 @@ unpack_zipballs(RelNameStr, Version) ->
GzFile = filename:absname(filename:join(["releases", RelNameStr ++ "-" ++ Version ++ ".tar.gz"])),
ZipFiles = filelib:wildcard(filename:join(["releases", RelNameStr ++ "-*" ++ Version ++ "*.zip"])),
?INFO("unzip ~p", [ZipFiles]),
[begin
lists:foreach(
fun(Zip) ->
TmdTarD = "/tmp/emqx_untar_" ++ integer_to_list(erlang:system_time()),
ok = filelib:ensure_dir(filename:join([TmdTarD, "dummy"])),
{ok, _} = file:copy(Zip, filename:join([TmdTarD, "emqx.zip"])),
@ -274,10 +275,11 @@ unpack_zipballs(RelNameStr, Version) ->
{ok, _FileList} = zip:unzip("emqx.zip"),
ok = file:set_cwd(filename:join([TmdTarD, "emqx"])),
ok = erl_tar:create(GzFile, filelib:wildcard("*"), [compressed])
end || Zip <- ZipFiles]
end,
ZipFiles)
after
% restore cwd
file:set_cwd(Cwd)
ok = file:set_cwd(Cwd)
end.
first_value(_Fun, []) -> no_value;