From 084ce97d41a5cb6799055123cf0a8c40d083878a Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Tue, 8 Dec 2020 21:56:35 +0100
Subject: [PATCH] fix(rel): rel_vsn renamed to release_version

---
 bin/emqx.cmd     |  2 +-
 bin/emqx_ctl.cmd |  2 +-
 data/emqx_vars   |  4 ++--
 rebar.config.erl | 26 +++++++++++++++++---------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/bin/emqx.cmd b/bin/emqx.cmd
index 6d59b0171..9092e553c 100644
--- a/bin/emqx.cmd
+++ b/bin/emqx.cmd
@@ -15,7 +15,7 @@
 
 :: Set variables that describe the release
 @set rel_name=emqx
-@set rel_vsn={{ rel_vsn }}
+@set rel_vsn={{ release_version }}
 @set erts_vsn={{ erts_vsn }}
 @set erl_opts={{ erl_opts }}
 
diff --git a/bin/emqx_ctl.cmd b/bin/emqx_ctl.cmd
index e8283fcdf..ae9cad2e7 100644
--- a/bin/emqx_ctl.cmd
+++ b/bin/emqx_ctl.cmd
@@ -4,7 +4,7 @@
 
 :: Set variables that describe the release
 @set rel_name=emqx
-@set rel_vsn={{ rel_vsn }}
+@set rel_vsn={{ release_version }}
 @set erts_vsn={{ erts_vsn }}
 @set erl_opts={{ erl_opts }}
 
diff --git a/data/emqx_vars b/data/emqx_vars
index a889f36d8..2266f741b 100644
--- a/data/emqx_vars
+++ b/data/emqx_vars
@@ -3,7 +3,7 @@
 ##       Update the vars to the end of this file instead.
 ######################################################################
 ## constants from relx template
-REL_VSN="{{ rel_vsn }}"
+REL_VSN="{{ release_version }}"
 ERTS_VSN="{{ erts_vsn }}"
 ERL_OPTS="{{ erl_opts }}"
 RUNNER_ROOT_DIR="{{ runner_root_dir }}"
@@ -17,6 +17,6 @@ EMQX_DISCR="{{ emqx_description }}"
 
 ## computed vars
 REL_NAME="emqx"
-ERTS_PATH=$RUNNER_ROOT_DIR/erts-$ERTS_VSN/bin
+ERTS_PATH="$RUNNER_ROOT_DIR/erts-$ERTS_VSN/bin"
 
 ## updated vars here
diff --git a/rebar.config.erl b/rebar.config.erl
index 20fd35416..faaca1c4e 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -49,6 +49,7 @@ profiles() ->
 relx(Profile) ->
     Vsn = get_vsn(),
     [ {include_src,false}
+    , {include_erts, true}
     , {extended_start_script,false}
     , {generate_start_script,false}
     , {sys_config,false}
@@ -144,15 +145,15 @@ relx_overlay(ReleaseType) ->
     , {copy,"bin/*","bin/"}
     , {template,"etc/*.conf","etc/"}
     , {template,"etc/emqx.d/*.conf","etc/emqx.d/"}
-    , {copy,"priv/emqx.schema","releases/{{rel_vsn}}/"}
+    , {copy,"priv/emqx.schema","releases/{{release_version}}/"}
     , {copy, "etc/certs","etc/"}
-    , {copy,"bin/emqx.cmd","bin/emqx.cmd-{{rel_vsn}}"}
-    , {copy,"bin/emqx_ctl.cmd","bin/emqx_ctl.cmd-{{rel_vsn}}"}
-    , {copy,"bin/emqx","bin/emqx-{{rel_vsn}}"}
-    , {copy,"bin/emqx_ctl","bin/emqx_ctl-{{rel_vsn}}"}
-    , {copy,"bin/install_upgrade.escript", "bin/install_upgrade.escript-{{rel_vsn}}"}
-    , {copy,"bin/nodetool","bin/nodetool-{{rel_vsn}}"}
-    , {copy,"_build/default/lib/cuttlefish/cuttlefish","bin/cuttlefish-{{rel_vsn}}"}
+    , {copy,"bin/emqx.cmd","bin/emqx.cmd-{{release_version}}"}
+    , {copy,"bin/emqx_ctl.cmd","bin/emqx_ctl.cmd-{{release_version}}"}
+    , {copy,"bin/emqx","bin/emqx-{{release_version}}"}
+    , {copy,"bin/emqx_ctl","bin/emqx_ctl-{{release_version}}"}
+    , {copy,"bin/install_upgrade.escript", "bin/install_upgrade.escript-{{release_version}}"}
+    , {copy,"bin/nodetool","bin/nodetool-{{release_version}}"}
+    , {copy,"_build/default/lib/cuttlefish/cuttlefish","bin/cuttlefish-{{release_version}}"}
     ] ++ do_relx_overlay(ReleaseType).
 
 do_relx_overlay(cloud) ->
@@ -164,8 +165,15 @@ do_relx_overlay(edge) ->
     , {template,"etc/emqx_edge.d/vm.args.edge","etc/vm.args"}
     ].
 
+env(Name, Default) ->
+    case os:getenv(Name) of
+        "" -> Default;
+        false -> Default;
+        Value -> Value
+    end.
+
 get_vsn() ->
-    PkgVsn = case os:getenv("PKG_VSN") of
+    PkgVsn = case env("PKG_VSN", false) of
                  false -> os:cmd("git describe --tags");
                  Vsn -> Vsn
              end,