From 014948c84ffd442abe9c4cb3a5e08a57086d48fc Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 27 Apr 2022 22:02:51 +0800
Subject: [PATCH] change

---
 packaging/tools/install.sh | 13 ++++++++-----
 packaging/tools/makepkg.sh |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index a267e0c17b..f1a5778d5a 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -29,6 +29,9 @@ logDir="/var/log/taos"
 configDir="/etc/taos"
 installDir="/usr/local/taos"
 adapterName="taosadapter"
+benchmarkName="taosBenchmark"
+dumpName="taosdump"
+demoName="taosdemo"
 
 data_dir=${dataDir}
 log_dir=${logDir}
@@ -202,9 +205,9 @@ function install_bin() {
   [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || :
   [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
   [ -x ${install_main_dir}/bin/${adapterName} ] && ${csudo}ln -s ${install_main_dir}/bin/${adapterName} ${bin_link_dir}/${adapterName} || :
-  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosdemo || :
-  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosBenchmark || :
-  [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -s ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${demoName} || :
+  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -s ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${benchmarkName} || :
+  [ -x ${install_main_dir}/bin/${dumpName} ] && ${csudo}ln -s ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName} || :
   [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
   [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
@@ -859,7 +862,7 @@ function updateProduct() {
     echo -e "\033[44;32;1m${productName} client is updated successfully!${NC}"
   fi
 
-  rm -rf $(tar -tf ${tarName} |grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
 }
 
 function installProduct() {
@@ -955,7 +958,7 @@ function installProduct() {
   fi
 
   touch ~/.${historyFile}
-  rm -rf $(tar -tf ${tarName} |grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
 }
 
 ## ==============================Main program starts from here============================
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 0863a1c1e4..161625da58 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -72,14 +72,15 @@ else
       ${build_dir}/bin/${benchmarkName} \
       ${build_dir}/bin/TDinsight.sh "
 
+#!!! do not change taosadapter here
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
       ${taostools_bin_files} \
-      ${build_dir}/bin/${adapterName} \
+      ${build_dir}/bin/taosadapter \
       ${build_dir}/bin/tarbitrator\
       ${script_dir}/remove.sh \
       ${script_dir}/set_core.sh \
-      ${script_dir}/run_${serverName}_and_${adapterName}.sh \
+      ${script_dir}/run_taosd_and_taosadapter.sh \
       ${script_dir}/startPre.sh \
       ${script_dir}/taosd-dump-cfg.gdb"
 fi
-- 
GitLab