From 2d1484cd5b873541d61f4ae7d67e27ef106194e8 Mon Sep 17 00:00:00 2001
From: huili <huili@taosdata.com>
Date: Thu, 1 Aug 2019 19:05:17 +0800
Subject: [PATCH] [no remove config, data, log files]

---
 packaging/tools/makepkg.sh |  4 +--
 packaging/tools/remove.sh  | 64 ++++----------------------------------
 2 files changed, 8 insertions(+), 60 deletions(-)

diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 3e42f7eb25..7f03a5876e 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -66,8 +66,8 @@ connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
 cp -r ${connector_dir}/grafana ${install_dir}/connector/
 cp -r ${connector_dir}/python  ${install_dir}/connector/
-cp -r ${connector_dir}/go ${install_dir}/connector
-cp ${build_dir}/lib/*.jar ${install_dir}/connector
+cp -r ${connector_dir}/go      ${install_dir}/connector
+cp ${build_dir}/lib/*.jar      ${install_dir}/connector
 
 
 # Copy release note
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 4d0e8e8e84..1a86534e72 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -1,33 +1,22 @@
 #!/bin/bash
 #
-# Script to stop the service and uninstall TSDB
+# Script to stop the service and uninstall tdengine, but retain the config, data and log files.
 
 RED='\033[0;31m'
 GREEN='\033[1;32m'
 NC='\033[0m'
 
-data_dir="/var/lib/taos"
-log_dir="/var/log/taos"
-
 #install main path
 install_main_dir="/usr/local/taos"
-
 data_link_dir="/usr/local/taos/data"
 log_link_dir="/usr/local/taos/log"
-
 cfg_link_dir="/usr/local/taos/cfg"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
 inc_link_dir="/usr/include"
 
-header_dir="/usr/local/include/taos"
-cfg_dir="/etc/taos"
-bin_dir="/usr/local/bin/taos"
-lib_dir="/usr/local/lib/taos"
-link_dir="/usr/bin"
 service_config_dir="/etc/systemd/system"
 taos_service_name="taosd"
-nginx_service_name="tdnginx"
 
 csudo=""
 if command -v sudo > /dev/null; then
@@ -52,41 +41,26 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/taosd     || :
     ${csudo} rm -f ${bin_link_dir}/taosdump  || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos    || :
-
-    # Remove binary files
-    #${csudo} rm -rf ${bin_dir}        || :
 }
+
 function clean_lib() {
     # Remove link
     ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    
-    #${csudo} rm -f /usr/lib/libtaos.so || :
-    #${csudo} rm -rf ${lib_dir}         || :
 }
 
 function clean_header() {
     # Remove link
     ${csudo} rm -f ${inc_link_dir}/taos.h       || :
-    
-    #${csudo} rm -rf ${header_dir}
 }
 
 function clean_config() {
     # Remove link
     ${csudo} rm -f ${cfg_link_dir}/*            || :    
-    #${csudo} rm -rf ${cfg_link_dir}            || :
 }
 
 function clean_log() {
-    if grep -e '^\s*logDir.*$' ${cfg_dir}/taos.cfg &> /dev/null; then
-        config_log_dir=$(cut -d ' ' -f2 <<< $(grep -e '^\s*logDir.*$' ${cfg_dir}/taos.cfg))
-        # echo "Removing log dir ${config_log_dir}......"
-        ${csudo} rm -rf ${config_log_dir}    || : 
-    fi
-    
     # Remove link
-    ${csudo} rm -rf ${log_link_dir}    || :     
-    ${csudo} rm -rf ${log_dir}         || :
+    ${csudo} rm -rf ${log_link_dir}    || :
 }
 
 function clean_service_on_systemd() {
@@ -123,16 +97,6 @@ function clean_service() {
     fi
 }
 
-isAll="true"
-if ! type taosd &> /dev/null; then
-    isAll="false"
-fi
-
-config_data_dir=''
-if grep -e '^\s*dataDir.*$' ${cfg_dir}/taos.cfg &> /dev/null; then
-    config_data_dir=$(cut -d ' ' -f2 <<< $(grep -e '^\s*dataDir.*$' ${cfg_dir}/taos.cfg))
-fi
-
 # Stop service and disable booting start.
 clean_service
 # Remove binary file and links
@@ -141,29 +105,13 @@ clean_bin
 clean_header
 # Remove lib file
 clean_lib
-# Remove log directory
+# Remove link log directory
 clean_log
-# Remove configuration file
+# Remove link configuration file
 clean_config
-# Remove data directory
+# Remove data link directory
 ${csudo} rm -rf ${data_link_dir}    || : 
 
-[ "$isAll" = "false" ] && exit 0 || :
-echo -e -n "${RED}Do you want to delete data stored in TDengine? [y/N]: ${NC}" 
-read is_delete
-while true; do
-    if [ "${is_delete}" = "y" ] || [ "${is_delete}" = "Y" ]; then
-        ${csudo} rm -rf ${data_dir}
-        # echo "Removing data file ${config_data_dir}..."
-        [ -n ${config_data_dir} ] && ${csudo} rm -rf ${config_data_dir}
-        break
-    elif [ "${is_delete}" = "n" ] || [ "${is_delete}" = "N" ]; then
-        break
-    else
-        read -p "Please enter 'y' or 'n': " is_delete
-    fi
-done
-
 ${csudo} rm -rf ${install_main_dir}
 
 osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
-- 
GitLab