Просмотр исходного кода

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
Zaiming (Stone) Shi 4 лет назад
Родитель
Сommit
1abac892c9
2 измененных файлов с 0 добавлено и 21 удалено
  1. 0 4
      bin/emqx
  2. 0 17
      bin/install_upgrade.escript

+ 0 - 4
bin/emqx

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

+ 0 - 17
bin/install_upgrade.escript

@@ -184,7 +184,6 @@ find_and_link_release_package(Version, RelName) ->
     %% we've found where the actual release package is located
     ReleaseLink = filename:join(["releases", Version,
                                  RelNameStr ++ ".tar.gz"]),
-    ok = unpack_zipballs(RelNameStr, Version),
     TarBalls = [
         filename:join(["releases",
                         RelNameStr ++ "-" ++ Version ++ ".tar.gz"]),
@@ -219,22 +218,6 @@ find_and_link_release_package(Version, RelName) ->
             {Filename, ReleaseHandlerPackageLink}
     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, [Value | Rest]) ->
     case Fun(Value) of