From f3bd5d446f8f71871e122b091276e6c43bc5eb01 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Mon, 28 Feb 2022 20:29:36 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 13440 add taos benchmark back (#10454)

* [TD-13440]<fix>: move taosBenchmark back in TDengine package

* update taos-tools

* remove TDinsight.sh too to void failure on second install

* cherry pick with 2.4 branch

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

* fix makeclient.sh dbName

* turn on taosTools tar.gz
---
 packaging/release.sh          |  8 ++++----
 packaging/tools/makeclient.sh |  1 +
 packaging/tools/makepkg.sh    | 18 +++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packaging/release.sh b/packaging/release.sh
index 9e5900688b..a96b312999 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -304,12 +304,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 51df13101e..1e15a916cf 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -13,6 +13,7 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+dbName=$9
 
 productName="TDengine"
 clientName="taos"
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index bce558ad98..54d85c4d4b 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -321,14 +321,14 @@ if [ "$exitcode" != "0" ]; then
     exit $exitcode
 fi
 
-#if [ -n "${taostools_bin_files}" ]; then
-#    wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh"
-#    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
-#    exitcode=$?
-#    if [ "$exitcode" != "0" ]; then
-#        echo "tar ${taostools_pkg_name}.tar.gz error !!!"
-#        exit $exitcode
-#    fi
-#fi
+if [ -n "${taostools_bin_files}" ]; then
+    wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh"
+    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
+    exitcode=$?
+    if [ "$exitcode" != "0" ]; then
+        echo "tar ${taostools_pkg_name}.tar.gz error !!!"
+        exit $exitcode
+    fi
+fi
 
 cd ${curr_dir}
-- 
GitLab