From 5c70ea58f809e449938822d7ef2ff9c6691d99ae Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Tue, 28 Feb 2023 10:31:36 +0800
Subject: [PATCH] fix: explorer packaging

---
 packaging/tools/install.sh       | 3 +++
 packaging/tools/make_install.bat | 3 +++
 packaging/tools/makepkg.sh       | 2 ++
 packaging/tools/remove.sh        | 1 +
 4 files changed, 9 insertions(+)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 5aeff0e2fa..2495e177e1 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -34,6 +34,7 @@ benchmarkName="taosBenchmark"
 dumpName="taosdump"
 demoName="taosdemo"
 xname="taosx"
+explorerName="${clientName}-explorer"
 
 clientName2="taos"
 serverName2="taosd"
@@ -214,6 +215,7 @@ function install_bin() {
   ${csudo}rm -f ${bin_link_dir}/${benchmarkName} || :
   ${csudo}rm -f ${bin_link_dir}/${dumpName} || :
   ${csudo}rm -f ${bin_link_dir}/${xname} || :
+  ${csudo}rm -f ${bin_link_dir}/${explorerName} || :
   ${csudo}rm -f ${bin_link_dir}/set_core || :
   ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
 
@@ -228,6 +230,7 @@ function install_bin() {
   [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -sf ${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/${xname} ] && ${csudo}ln -s ${install_main_dir}/bin/${xname} ${bin_link_dir}/${xname} || :
+  [ -x ${install_main_dir}/bin/${explorerName} ] && ${csudo}ln -s ${install_main_dir}/bin/${explorerName} ${bin_link_dir}/${explorerName} || :
   [ -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 || :
diff --git a/packaging/tools/make_install.bat b/packaging/tools/make_install.bat
index f5ed1cdf66..6dc7c356cd 100644
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
@@ -70,6 +70,9 @@ if %Enterprise% == TRUE (
     if exist %binary_dir%\\build\\bin\\taosx.exe (
         copy %binary_dir%\\build\\bin\\taosx.exe %target_dir% > nul
     )
+    if exist %binary_dir%\\build\\bin\\taos-explorer.exe (
+        copy %binary_dir%\\build\\bin\\taos-explorer.exe %target_dir% > nul
+    )
     if exist %binary_dir%\\build\\bin\\tmq_sim.exe (
         copy %binary_dir%\\build\\bin\\tmq_sim.exe %target_dir% > nul
     )
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 0a34d81b7f..92a20418c5 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -89,11 +89,13 @@ else
       ${build_dir}/bin/tdengine-datasource.zip \
       ${build_dir}/bin/tdengine-datasource.zip.md5sum"
   [ -f ${build_dir}/bin/taosx ] && taosx_bin="${build_dir}/bin/taosx"
+  explorer_bin_files=$(sh -c "ls ${build_dir}/bin/*-explorer")
 
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
       ${taostools_bin_files} \
       ${taosx_bin} \
+      ${explorer_bin_files} \
       ${build_dir}/bin/taosadapter \
       ${build_dir}/bin/udfd \
       ${script_dir}/remove.sh \
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 9c50c4582d..2479e48670 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -119,6 +119,7 @@ function clean_bin() {
   ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
   ${csudo}rm -f ${bin_link_dir}/taoskeeper || :
   ${csudo}rm -f ${bin_link_dir}/taosx || :
+  ${csudo}rm -f ${bin_link_dir}/taos-explorer || :
 
   if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
     ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
-- 
GitLab