[NONE]

packaging/deb/DEBIAN/preinst

@@ -5,20 +5,15 @@ if command -v sudo > /dev/null; then
     csudo="sudo"
 fi
 
-function is_using_systemd() {
-    if pidof systemd &> /dev/null; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 # Stop the service if running
 if pidof taosd &> /dev/null; then
-    if is_using_systemd; then
+    if pidof systemd &> /dev/null; then
         ${csudo} systemctl stop taosd || :
-    else
+    elif $(which insserv &> /dev/null); then
         ${csudo} service taosd stop || :
+    else
+        pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+        ${csudo} kill -9 ${pid}   || :
     fi
     echo "Stop taosd service success!"
     sleep 1
@@ -33,4 +28,3 @@ fi
 
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo} rm -f ${install_main_dir}/driver/libtaos*   || :    
-

packaging/deb/DEBIAN/prerm

@@ -7,6 +7,34 @@ if command -v sudo > /dev/null; then
     csudo="sudo"
 fi
 
-${csudo} chmod -R 744 ${insmetaPath}
+${csudo} chmod -R 744 ${insmetaPath}  || :
-cd ${insmetaPath}
+#cd ${insmetaPath}
-${csudo} ./preun.sh
+#${csudo} ./preun.sh
+if [ -f ${insmetaPath}/preun.sh ]; then
+    cd ${insmetaPath}
+    ${csudo} ./preun.sh
+else
+    bin_link_dir="/usr/bin"
+    lib_link_dir="/usr/lib"
+    inc_link_dir="/usr/include"
+    
+    data_link_dir="/usr/local/taos/data"
+    log_link_dir="/usr/local/taos/log"
+    cfg_link_dir="/usr/local/taos/cfg"
+
+    # Remove all links
+    ${csudo} rm -f ${bin_link_dir}/taos       || :
+    ${csudo} rm -f ${bin_link_dir}/taosd      || :
+    ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
+    ${csudo} rm -f ${bin_link_dir}/taosdump   || :
+    ${csudo} rm -f ${cfg_link_dir}/*          || :
+    ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
+    
+    ${csudo} rm -f ${log_link_dir}            || :
+    ${csudo} rm -f ${data_link_dir}           || :
+    
+    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+    ${csudo} kill -9 ${pid}   || :
+fi
+

packaging/rpm/tdengine.spec

@@ -119,8 +119,36 @@ if command -v sudo > /dev/null; then
 fi
 # only remove package to call preun.sh, not but update(2) 
 if [ $1 -eq 0 ];then
-  cd %{homepath}/script
+  #cd %{homepath}/script
-  ${csudo} ./preun.sh
+  #${csudo} ./preun.sh
+  
+  if [ -f %{homepath}/script/preun.sh ]; then
+    cd %{homepath}/script
+    ${csudo} ./preun.sh
+  else
+    bin_link_dir="/usr/bin"
+    lib_link_dir="/usr/lib"
+    inc_link_dir="/usr/include"
+    
+    data_link_dir="/usr/local/taos/data"
+    log_link_dir="/usr/local/taos/log"
+    cfg_link_dir="/usr/local/taos/cfg"
+
+    # Remove all links
+    ${csudo} rm -f ${bin_link_dir}/taos       || :
+    ${csudo} rm -f ${bin_link_dir}/taosd      || :
+    ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
+    ${csudo} rm -f ${bin_link_dir}/taosdump   || :
+    ${csudo} rm -f ${cfg_link_dir}/*          || :
+    ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
+    
+    ${csudo} rm -f ${log_link_dir}            || :
+    ${csudo} rm -f ${data_link_dir}           || :
+    
+    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+    ${csudo} kill -9 ${pid}   || :      
+  fi  
 fi
  
 # Scripts executed after uninstall

packaging/tools/make_install.sh

@@ -61,7 +61,7 @@ fi
 
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-  ${csudo} kill -9 pid   || :
+  ${csudo} kill -9 ${pid}   || :
 }
 
 function install_main_path() {

packaging/tools/preun.sh

@@ -22,18 +22,28 @@ if command -v sudo > /dev/null; then
     csudo="sudo"
 fi
 
-function is_using_systemd() {
+initd_mod=0
-    if pidof systemd &> /dev/null; then
+service_mod=2
-        return 0
+if pidof systemd &> /dev/null; then
-    else
+    service_mod=0
-        return 1
+elif $(which insserv &> /dev/null); then
-    fi
+    service_mod=1
-}
+    initd_mod=1
-
-if ! is_using_systemd; then
     service_config_dir="/etc/init.d"
+elif $(which update-rc.d &> /dev/null); then
+    service_mod=1
+    initd_mod=2
+    service_config_dir="/etc/init.d"
+else 
+    service_mod=2
 fi
 
+
+function kill_taosd() {
+  pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+  ${csudo} kill -9 ${pid}   || :
+}
+
 function clean_service_on_systemd() {
     taosd_service_config="${service_config_dir}/${taos_service_name}.service"
 
@@ -48,23 +58,29 @@ function clean_service_on_systemd() {
 
 function clean_service_on_sysvinit() {
     restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-
     if pidof taosd &> /dev/null; then
-        echo "TDengine taosd is running, stopping it..."
         ${csudo} service taosd stop || :
     fi
-
     ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
     ${csudo} rm -f ${service_config_dir}/taosd || :
-    ${csudo} update-rc.d -f taosd remove || :
+
+    if ((${initd_mod}==1)); then
+        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} insserv -r taosd || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} update-rc.d -f taosd remove || :
+    fi
+#    ${csudo} update-rc.d -f taosd remove || :
     ${csudo} init q || :
 }
 
 function clean_service() {
-    if is_using_systemd; then
+    if ((${service_mod}==0)); then
         clean_service_on_systemd
-    else
+    elif ((${service_mod}==1)); then
         clean_service_on_sysvinit
+    else
+        # must manual start taosd
+        kill_taosd
     fi
 }
 
@@ -83,4 +99,8 @@ ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
 ${csudo} rm -f ${log_link_dir}            || :
 ${csudo} rm -f ${data_link_dir}           || :
 
+if ((${service_mod}==2)); then
+    kill_taosd
+fi
+
 echo -e "${GREEN}TDEngine is removed successfully!${NC}"