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

refactor: install_upgrade script no need to re-pack 

OTP release handler only works with .tar.gz
as a result, we had to unpack .zip and re-pack .tar.gz
just to make OTP happy.

Now since we will be building .tar.gz packages
there is no need for this re-pack step anymore
This commit is contained in:
Zaiming (Stone) Shi 2022-01-12 23:19:51 +01:00
parent 638a9d1af7
commit 1abac892c9
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/emqx
View File

@ -149,7 +149,6 @@ usage() {
echo "release package tarball has already been deployed at one" echo "release package tarball has already been deployed at one"
echo "of the following locations:" echo "of the following locations:"
echo " releases/<relname>-<version>.tar.gz" echo " releases/<relname>-<version>.tar.gz"
echo " releases/<relname>-<version>.zip"
;; ;;
install) install)
echo "Usage: $REL_NAME install [VERSION]" echo "Usage: $REL_NAME install [VERSION]"
@ -157,7 +156,6 @@ usage() {
echo "release package tarball has already been deployed at one" echo "release package tarball has already been deployed at one"
echo "of the following locations:" echo "of the following locations:"
echo " releases/<relname>-<version>.tar.gz" echo " releases/<relname>-<version>.tar.gz"
echo " releases/<relname>-<version>.zip"
echo "" echo ""
echo " --no-permanent Install release package VERSION but" echo " --no-permanent Install release package VERSION but"
echo " don't make it permanent" echo " don't make it permanent"
@ -173,7 +171,6 @@ usage() {
echo "that a release package tarball has already been deployed at one" echo "that a release package tarball has already been deployed at one"
echo "of the following locations:" echo "of the following locations:"
echo " releases/<relname>-<version>.tar.gz" echo " releases/<relname>-<version>.tar.gz"
echo " releases/<relname>-<version>.zip"
echo "" echo ""
echo " --no-permanent Install release package VERSION but" echo " --no-permanent Install release package VERSION but"
echo " don't make it permanent" echo " don't make it permanent"
@ -184,7 +181,6 @@ usage() {
echo "that a release package tarball has already been deployed at one" echo "that a release package tarball has already been deployed at one"
echo "of the following locations:" echo "of the following locations:"
echo " releases/<relname>-<version>.tar.gz" echo " releases/<relname>-<version>.tar.gz"
echo " releases/<relname>-<version>.zip"
echo "" echo ""
echo " --no-permanent Install release package VERSION but" echo " --no-permanent Install release package VERSION but"
echo " don't make it permanent" echo " don't make it permanent"

17
bin/install_upgrade.escript
View File

@ -184,7 +184,6 @@ find_and_link_release_package(Version, RelName) ->
%% we've found where the actual release package is located %% we've found where the actual release package is located
ReleaseLink = filename:join(["releases", Version, ReleaseLink = filename:join(["releases", Version,
RelNameStr ++ ".tar.gz"]), RelNameStr ++ ".tar.gz"]),
ok = unpack_zipballs(RelNameStr, Version),
TarBalls = [ TarBalls = [
filename:join(["releases", filename:join(["releases",
RelNameStr ++ "-" ++ Version ++ ".tar.gz"]), RelNameStr ++ "-" ++ Version ++ ".tar.gz"]),
@ -219,22 +218,6 @@ find_and_link_release_package(Version, RelName) ->
{Filename, ReleaseHandlerPackageLink} {Filename, ReleaseHandlerPackageLink}
end. end.
unpack_zipballs(RelNameStr, Version) ->
{ok, Cwd} = file:get_cwd(),
GzFile = filename:absname(filename:join(["releases", RelNameStr ++ "-" ++ Version ++ ".tar.gz"])),
ZipFiles = filelib:wildcard(filename:join(["releases", RelNameStr ++ "-*" ++ Version ++ "*.zip"])),
?INFO("unzip ~p", [ZipFiles]),
[begin
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"])),
ok = file:set_cwd(filename:join([TmdTarD])),
{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],
file:set_cwd(Cwd).
first_value(_Fun, []) -> no_value; first_value(_Fun, []) -> no_value;
first_value(Fun, [Value | Rest]) -> first_value(Fun, [Value | Rest]) ->
case Fun(Value) of case Fun(Value) of