From a0c6a6a62815990c9e8babe7dec45dd7d41c1869 Mon Sep 17 00:00:00 2001
From: facetosea <25808407@qq.com>
Date: Thu, 5 Jan 2023 09:45:02 +0800
Subject: [PATCH 1/2] enh/skip unused process when packaging on mac

---
 packaging/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/release.sh b/packaging/release.sh
index 7a8a08352f..3ec5717606 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -314,6 +314,6 @@ if [ "$osType" != "Darwin" ]; then
 
 else
   cd ${script_dir}/tools
-  ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
-  ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+  # ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
+  # ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
 fi

From 6ec16c1a4817e556c36d29a46b4f8dda25bbf3f9 Mon Sep 17 00:00:00 2001
From: facetosea <25808407@qq.com>
Date: Fri, 6 Jan 2023 00:17:59 +0800
Subject: [PATCH 2/2] enh/TD-21744/macPackag taoskeeper install

---
 packaging/tools/post.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index 482345dcd8..b246e0225f 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -109,6 +109,13 @@ function kill_taosadapter() {
   fi
 }
 
+function kill_taoskeeper() {
+  pid=$(ps -ef | grep "taoskeeper" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo}kill -9 $pid   || :
+  fi
+}
+
 function kill_taosd() {
 #  ${csudo}pkill -f taosd || :
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
@@ -161,6 +168,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/udfd     || :
     ${csudo}rm -f ${bin_link_dir}/taosadapter     || :
     ${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
+    ${csudo}rm -f ${bin_link_dir}/taoskeeper || :
     ${csudo}rm -f ${bin_link_dir}/taosdemo || :
     ${csudo}rm -f ${bin_link_dir}/taosdump || :
     ${csudo}rm -f ${bin_link_dir}/rmtaos   || :
@@ -179,6 +187,7 @@ function install_bin() {
     [ -x ${bin_dir}/taosdump ] && ${csudo}ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
     [ -x ${bin_dir}/set_core.sh ] && ${csudo}ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
     [ -x ${bin_dir}/remove.sh ] && ${csudo}ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || :
+    [ -x ${bin_dir}/taoskeeper ] && ${csudo}ln -sf ${bin_dir}/taoskeeper ${bin_link_dir}/taoskeeper || :
 }
 
 function add_newHostname_to_hosts() {
@@ -351,6 +360,22 @@ function install_taosadapter_config() {
         ${csudo}ln -s ${cfg_install_dir}/taosadapter.toml ${cfg_dir}
 }
 
+function install_taoskeeper_config() {
+    if [ ! -f "${cfg_install_dir}/keeper.toml" ]; then
+        [ ! -d %{cfg_install_dir} ] &&
+            ${csudo}${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${cfg_dir}/keeper.toml ] && ${csudo}cp ${cfg_dir}/keeper.toml ${cfg_install_dir}
+        [ -f ${cfg_install_dir}/keeper.toml ] &&
+            ${csudo}chmod 644 ${cfg_install_dir}/keeper.toml
+    fi
+
+    [ -f ${cfg_dir}/keeper.toml ] &&
+        ${csudo}mv ${cfg_dir}/keeper.toml ${cfg_dir}/keeper.toml.new
+
+    [ -f ${cfg_install_dir}/keeper.toml ] &&
+        ${csudo}ln -s ${cfg_install_dir}/keeper.toml ${cfg_dir}
+}
+
 function install_config() {
     if [ ! -f "${cfg_install_dir}/taos.cfg" ]; then
         ${csudo}${csudo}mkdir -p ${cfg_install_dir}
@@ -583,6 +608,7 @@ function install_TDengine() {
     install_bin
     install_config
     install_taosadapter_config
+    install_taoskeeper_config
     install_taosadapter_service
     install_service
     install_app