From 94244081f8a603741232f518cb681522064daf2e Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Wed, 21 Aug 2024 13:34:34 +0800
Subject: [PATCH] TD-31315: uninstall taosx update

---
 packaging/tools/install.sh |  6 +++---
 packaging/tools/makepkg.sh |  4 ++--
 packaging/tools/remove.sh  | 33 ++++++++++++++++++---------------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 374d17ada6..8a6b159a22 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -229,8 +229,8 @@ function install_bin() {
     if [ -d ${script_dir}/${xname}/bin ]; then
       ${csudo}cp -r ${script_dir}/${xname}/bin/* ${install_main_dir}/bin
     fi
-    if [ -e ${script_dir}/${xname}/uninstall.sh ]; then
-      ${csudo}cp -r ${script_dir}/${xname}/uninstall.sh ${install_main_dir}/uninstall_${xname}.sh
+    if [ -e ${script_dir}/${xname}/uninstall_${xname}.sh ]; then
+      ${csudo}cp -r ${script_dir}/${xname}/uninstall_${xname}.sh ${install_main_dir}/uninstall_${xname}.sh
     fi
   fi
   
@@ -254,7 +254,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/${service} ] && ${csudo}ln -sf ${install_main_dir}/bin/${service} ${bin_link_dir}/${service} || :
   done
 
-  [ ${install_main_dir}/uninstall_${xname}.sh ] && ${csudo}ln -sf ${install_main_dir}/uninstall_${xname}.sh ${bin_link_dir}/uninstall_${xname}.sh || :
+  [ -x ${install_main_dir}/uninstall_${xname}.sh ] && ${csudo}ln -sf ${install_main_dir}/uninstall_${xname}.sh ${bin_link_dir}/uninstall_${xname}.sh || :
 }
 
 function install_lib() {
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 9e1cc73238..b614170fd8 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -363,8 +363,8 @@ if [ "$verMode" == "cluster" ]; then
         # copy taosx
         if [ -d ${top_dir}/../enterprise/src/plugins/taosx/release/taosx ]; then
           cp -r ${top_dir}/../enterprise/src/plugins/taosx/release/taosx ${install_dir}          
-          cp ${top_dir}/../enterprise/src/plugins/taosx/packaging/uninstall.sh ${install_dir}/taosx
-          sed -i 's/target=\"\"/target=\"taosx\"/g' ${install_dir}/taosx/uninstall.sh
+          cp ${top_dir}/../enterprise/src/plugins/taosx/packaging/uninstall.sh ${install_dir}/taosx/uninstall_taosx.sh
+          sed -i "s/uninstall.sh/uninstall_taosx.sh/g" ${install_dir}/taosx/uninstall_taosx.sh
         fi
     fi
 fi
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 88dcbf41f3..58a17e2a50 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -226,29 +226,27 @@ function remove_data_and_config() {
   [ -d "${log_dir}" ] && ${csudo}rm -rf ${log_dir}
 }
 
-function remove_taosx() {
-  if [ -e /usr/local/taos/taosx/uninstall.sh ]; then
-    bash /usr/local/taos/taosx/uninstall.sh
-  fi
-}
-
 echo 
 echo "Do you want to remove all the data, log and configuration files? [y/n]"
 read answer
+remove_flag=false
 if [ X$answer == X"y" ] || [ X$answer == X"Y" ]; then
   confirmMsg="I confirm that I would like to delete all data, log and configuration files"
   echo "Please enter '${confirmMsg}' to continue"
   read answer
-  if [ X"$answer" == X"${confirmMsg}" ]; then
-    remove_data_and_config
-    if [ -e /usr/bin/uninstall_${PREFIX}x.sh ]; then
-      bash /usr/bin/uninstall_${PREFIX}x.sh --clean-all true
-    fi
+  if [ X"$answer" == X"${confirmMsg}" ]; then    
+    remove_flag=true    
   else    
-    echo "answer doesn't match, skip this step"
-    if [ -e /usr/bin/uninstall_${PREFIX}x.sh ]; then
-      bash /usr/bin/uninstall_${PREFIX}x.sh --clean-all false
-    fi
+    echo "answer doesn't match, skip this step"    
+  fi
+fi
+echo 
+
+if [ -e ${install_main_dir}/uninstall_${PREFIX}x.sh ]; then
+  if [ X$remove_flag == X"true" ]; then  
+    bash ${install_main_dir}/uninstall_${PREFIX}x.sh --clean-all true
+  else
+    bash ${install_main_dir}/uninstall_${PREFIX}x.sh --clean-all false
   fi
 fi
 
@@ -262,6 +260,11 @@ clean_log
 clean_config
 # Remove data link directory
 ${csudo}rm -rf ${data_link_dir} || :
+
+if [ X$remove_flag == X"true" ]; then
+  remove_data_and_config
+fi
+
 ${csudo}rm -rf ${install_main_dir} || :
 if [[ -e /etc/os-release ]]; then
   osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)