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

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
parent 93411ecd4b d60252d678
commit ec80a05a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/install_upgrade.escript
View File

@ -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) ->
ok = filelib:ensure_dir(filename:join([TmdTarD, "dummy"])), TmdTarD = "/tmp/emqx_untar_" ++ integer_to_list(erlang:system_time()),
{ok, _} = file:copy(Zip, filename:join([TmdTarD, "emqx.zip"])), ok = filelib:ensure_dir(filename:join([TmdTarD, "dummy"])),
ok = file:set_cwd(filename:join([TmdTarD])), {ok, _} = file:copy(Zip, filename:join([TmdTarD, "emqx.zip"])),
{ok, _FileList} = zip:unzip("emqx.zip"), ok = file:set_cwd(filename:join([TmdTarD])),
ok = file:set_cwd(filename:join([TmdTarD, "emqx"])), {ok, _FileList} = zip:unzip("emqx.zip"),
ok = erl_tar:create(GzFile, filelib:wildcard("*"), [compressed]) ok = file:set_cwd(filename:join([TmdTarD, "emqx"])),
end || Zip <- ZipFiles] ok = erl_tar:create(GzFile, filelib:wildcard("*"), [compressed])
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;