From 6a0d2c9d46a2a0708db1b31ea70434ed532754a2 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 11 Aug 2022 08:25:37 +0200
Subject: [PATCH 1/4] fix: add the 'die' function in bin/emqx

---
 bin/emqx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/emqx b/bin/emqx
index 20cf266b0..7a31f32ce 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -36,6 +36,13 @@ ERTS_LIB_DIR="$ERTS_DIR/../lib"
 # Echo to stderr on errors
 echoerr() { echo "$*" 1>&2; }
 
+die() {
+    set +x
+    echoerr "ERROR: $1"
+    errno=${2:-1}
+    exit "$errno"
+}
+
 assert_node_alive() {
     if ! relx_nodetool "ping" > /dev/null; then
         die "node_is_not_running!" 1

From 3a917605f585582e8f6cd2e9f61778b11c93f52d Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 11 Aug 2022 13:15:45 +0200
Subject: [PATCH 2/4] fix(bin/emqx): avoid creating crash dump file when
 checking erlang

---
 bin/emqx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/emqx b/bin/emqx
index 7a31f32ce..13371f9da 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -52,7 +52,8 @@ assert_node_alive() {
 check_erlang_start() {
     # Fix bin permission
     find "$BINDIR" ! -executable -exec chmod a+x {} \;
-    "$BINDIR/$PROGNAME" -boot "$REL_DIR/start_clean" -eval "crypto:start(),halt()"
+    # set ERL_CRASH_DUMP_BYTES to zero so it will not write a crash dump file
+    env ERL_CRASH_DUMP_BYTES=0 "$BINDIR/$PROGNAME" -boot "$REL_DIR/start_clean" -eval "crypto:start(),halt()"
 }
 
 if ! check_erlang_start >/dev/null 2>&1; then

From 4531703d1430ba159d8de96861761a8e002b53aa Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 11 Aug 2022 13:17:56 +0200
Subject: [PATCH 3/4] refactor(bin/emqx): move file permission fix out from
 check_erlang_start

---
 bin/emqx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/emqx b/bin/emqx
index 13371f9da..f129a8447 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -33,6 +33,10 @@ export PROGNAME="erl"
 DYNLIBS_DIR="$RUNNER_ROOT_DIR/dynlibs"
 ERTS_LIB_DIR="$ERTS_DIR/../lib"
 
+# Fix bin permission for all erts bin files
+# the 'x' attributes may get lost if the files are extracted from a relup package
+find "$BINDIR" -exec chmod a+x {} \;
+
 # Echo to stderr on errors
 echoerr() { echo "$*" 1>&2; }
 
@@ -50,8 +54,6 @@ assert_node_alive() {
 }
 
 check_erlang_start() {
-    # Fix bin permission
-    find "$BINDIR" ! -executable -exec chmod a+x {} \;
     # set ERL_CRASH_DUMP_BYTES to zero so it will not write a crash dump file
     env ERL_CRASH_DUMP_BYTES=0 "$BINDIR/$PROGNAME" -boot "$REL_DIR/start_clean" -eval "crypto:start(),halt()"
 }

From 2ef8a985b34adc085bff8ce5fb4399b0afbad764 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Fri, 12 Aug 2022 10:41:05 +0800
Subject: [PATCH 4/4] chore: bump vsn to 4.3.18

---
 include/emqx_release.hrl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl
index 77a02177b..305815de1 100644
--- a/include/emqx_release.hrl
+++ b/include/emqx_release.hrl
@@ -29,11 +29,10 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.3.18-beta.1"}).
+-define(EMQX_RELEASE, {opensource, "4.3.18"}).
 
 -else.
 
-
 -endif.
 
 -endif.