yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(install_upgrade): fix unpack_zipballs return value

This commit is contained in:
Ilya Averyanov 2022-04-21 11:56:51 +03:00
parent 93411ecd4b
commit d60252d678
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/install_upgrade.escript
View File

@ -266,7 +266,8 @@ 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(
fun(Zip) ->
TmdTarD = "/tmp/emqx_untar_" ++ integer_to_list(erlang:system_time()), 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"])),
@ -274,10 +275,11 @@ unpack_zipballs(RelNameStr, Version) ->
{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;