Hotfix/sangshuduo/td 13440 add taos benchmark back for2.4 (#10458)

* 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

* turn debug echo off

* turn on taosTools tar.gz

* revert tools/makepkg.sh
Co-authored-by: NHuo Linhe <linhehuo@gmail.com>

packaging/tools/makepkg.sh

@@ -3,7 +3,7 @@
 # Generate tar.gz package for all os system
 
 set -e
-set -x
+#set -x
 
 curr_dir=$(pwd)
 compile_dir=$1
@@ -74,9 +74,6 @@ else
 
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
-      ${build_dir}/bin/taosBenchmark \
-      ${build_dir}/bin/taosdump \
-      ${build_dir}/bin/TDinsight.sh \
       ${taostools_bin_files} \
       ${build_dir}/bin/taosadapter \
       ${build_dir}/bin/tarbitrator\
@@ -150,36 +147,36 @@ if [ $adapterName != "taosadapter" ]; then
   mv ${install_dir}/bin/taosd-dump-cfg.gdb ${install_dir}/bin/${serverName}-dump-cfg.gdb
 fi
 
-#if [ -n "${taostools_bin_files}" ]; then
-#    mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
-#    mkdir -p ${taostools_install_dir}/bin \
-#        && cp ${taostools_bin_files} ${taostools_install_dir}/bin \
-#        && chmod a+x ${taostools_install_dir}/bin/* || :
-
-#    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
-#        cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
-#            ${taostools_install_dir}/ > /dev/null \
-#            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
-#            || echo -e "failed to copy install-taostools.sh"
-#    else
-#        echo -e "install-taostools.sh not found"
-#    fi
-
-#    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh ]; then
-#        cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh \
-#            ${taostools_install_dir}/ > /dev/null \
-#            && chmod a+x ${taostools_install_dir}/uninstall-taostools.sh \
-#            || echo -e "failed to copy uninstall-taostools.sh"
-#    else
-#        echo -e "uninstall-taostools.sh not found"
-#    fi
-
-#    if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
-#        mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
-#        cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
-#        cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
-#    fi
-#fi
+if [ -n "${taostools_bin_files}" ]; then
+    mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
+    mkdir -p ${taostools_install_dir}/bin \
+        && cp ${taostools_bin_files} ${taostools_install_dir}/bin \
+        && chmod a+x ${taostools_install_dir}/bin/* || :
+
+    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
+        cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
+            ${taostools_install_dir}/ > /dev/null \
+            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
+            || echo -e "failed to copy install-taostools.sh"
+    else
+        echo -e "install-taostools.sh not found"
+    fi
+
+    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh ]; then
+        cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh \
+            ${taostools_install_dir}/ > /dev/null \
+            && chmod a+x ${taostools_install_dir}/uninstall-taostools.sh \
+            || echo -e "failed to copy uninstall-taostools.sh"
+    else
+        echo -e "uninstall-taostools.sh not found"
+    fi
+
+    if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
+        mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
+        cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
+        cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
+    fi
+fi
 
 if [ -f ${build_dir}/bin/jemalloc-config ]; then
   mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}