From 4667527892abe449370fbee5dd5eb052e73a7ffe Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Mon, 28 Feb 2022 19:33:25 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 13440 add taos benchmark back for2.4
 (#10453)

* cherry pick from develop branch

* update taos-tools

* cherry pick 77f7bca2dc0358aff615e6dcf2fe60105ebbcfe0

* [TD-13531]<fix>: fix rm error: refusing to remove '.'

* [TD-13440]<fix>: release lite tar.gz

* [TD-13440]<fix>: make taosdump/TDinsight be included again.

* fix makeclient.sh dbName

Co-authored-by: Huo Linhe <linhehuo@gmail.com>
---
 packaging/release.sh          | 10 +++++-----
 packaging/tools/makeclient.sh |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packaging/release.sh b/packaging/release.sh
index c672418d9b..fbb6904d36 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -3,7 +3,7 @@
 # Generate the deb package for ubuntu, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
-#set -x
+set -x
 
 # release.sh  -v [cluster | edge]
 #             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
@@ -305,12 +305,12 @@ if [ "$osType" != "Darwin" ]; then
   echo "====do tar.gz package for all systems===="
   cd ${script_dir}/tools
 
-  ${csudo} ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
-  #  ${csudo}./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
-  #  ${csudo}./makearbi.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+  ${csudo}./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
+  ${csudo}./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+  ${csudo}./makearbi.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
 
 else
   # only make client for Darwin
   cd ${script_dir}/tools
-  ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${dbName}
+  ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
 fi
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 620b7e9239..4f714a30f5 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -2,7 +2,7 @@
 #
 # Generate tar.gz package for linux client in all os system
 set -e
-#set -x
+set -x
 
 curr_dir=$(pwd)
 compile_dir=$1
@@ -13,6 +13,7 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+dbName=$9
 
 productName="TDengine"
 clientName="taos"
-- 
GitLab