From feea817446e25ff1ef77cefaeeda08f45564d6bc Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Thu, 12 Mar 2020 18:36:51 +0800
Subject: [PATCH] [modify for puhua version]

---
 CMakeLists.txt                    |  38 ++++-
 packaging/release.sh              |  26 +--
 packaging/tools/install.sh        | 254 +++++++++++++++---------------
 packaging/tools/install_client.sh |  80 +++++-----
 packaging/tools/makeclient.sh     |  51 ++++--
 packaging/tools/makepkg.sh        |  75 +++++++--
 packaging/tools/remove.sh         |  62 ++++----
 src/kit/shell/CMakeLists.txt      |   6 +-
 src/kit/taosdemo/CMakeLists.txt   |   6 +-
 src/kit/taosdump/CMakeLists.txt   |   6 +-
 src/system/detail/CMakeLists.txt  |  14 +-
 11 files changed, 370 insertions(+), 248 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0f4b22d63..5a1861769a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,40 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
 #     open the file named TDengine.sln
 #
 
+# database variables
+# cmake .. -G "NMake Makefiles" -DDBNAME=[taos | power]
+
+# set default db name
+SET(DB_CLIENT_NAME "taos")
+SET(DB_SERVICE_NAME "taosd")
+SET(DB_FULL_NAME "TDengine")
+SET(DB_COPYRIGHT "TAOS Data")
+SET(DB_COMPANY "taosdata")
+  
+IF (${DBNAME} MATCHES "taos")
+  SET(DB_CLIENT_NAME "taos")
+  SET(DB_SERVICE_NAME "taosd")
+  SET(DB_FULL_NAME "TDengine")
+  SET(DB_COPYRIGHT "TAOS Data")
+  SET(DB_COMPANY "taosdata")
+ELSEIF (${DBNAME} MATCHES "power")
+  SET(DB_CLIENT_NAME "power")
+  SET(DB_SERVICE_NAME "powerd")
+  SET(DB_FULL_NAME "PowerDB")
+  SET(DB_COPYRIGHT "PowerDB")
+  SET(DB_COMPANY "powerdb")  
+ELSE ()
+  MESSAGE(STATUS "No db name input, build the version as default dbname: taos")
+ENDIF ()
+
+
+ADD_DEFINITIONS(-DDB_CLIENT_NAME="${DB_CLIENT_NAME}")
+ADD_DEFINITIONS(-DDB_SERVICE_NAME="${DB_SERVICE_NAME}")
+ADD_DEFINITIONS(-DDB_FULL_NAME="${DB_FULL_NAME}")
+ADD_DEFINITIONS(-DDB_COPYRIGHT="${DB_COPYRIGHT}")
+ADD_DEFINITIONS(-DDB_COMPANY="${DB_COMPANY}")
+MESSAGE(STATUS "Build ${DB_FULL_NAME} Version")
+
 SET(TD_GODLL FALSE)
 IF (${DLLTYPE} MATCHES "go")
   ADD_DEFINITIONS(-D_TD_GO_DLL_)
@@ -265,7 +299,7 @@ IF (NOT DEFINED TD_CLUSTER)
     INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
     INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")  
   ELSEIF (TD_WINDOWS_64)
-    SET(CMAKE_INSTALL_PREFIX C:/TDengine)
+    SET(CMAKE_INSTALL_PREFIX C:/${DB_FULL_NAME})  
     IF (NOT TD_GODLL)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/grafana DESTINATION connector)
@@ -276,7 +310,7 @@ IF (NOT DEFINED TD_CLUSTER)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)    
-      INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
+      INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${DB_CLIENT_NAME}.exe DESTINATION .)  
       #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
       #INSTALL(TARGETS shell RUNTIME DESTINATION .)
       IF (TD_MVN_INSTALLED)
diff --git a/packaging/release.sh b/packaging/release.sh
index a4562d21d2..e67d84a62f 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -3,13 +3,14 @@
 # Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
-#set -x
+set -x
 
 # releash.sh  -v [cluster | edge]  
 #             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] 
 #             -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  
 #             -V [stable | beta]
 #             -l [full | lite]
+#             -n [taos | power | ...]
 
 # set parameters by default value
 verMode=edge     # [cluster, edge]
@@ -17,8 +18,9 @@ verType=stable   # [stable, beta]
 cpuType=x64      # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
 osType=Linux     # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
 pagMode=full     # [full | lite]
+dbName=taos      # [taos | power | ...]
 
-while getopts "hv:V:c:o:l:" arg
+while getopts "hv:V:c:o:l:n:" arg
 do
   case $arg in
     v)
@@ -37,12 +39,16 @@ do
       #echo "pagMode=$OPTARG"
       pagMode=$(echo $OPTARG)
       ;;
+    n)
+      #echo "dbName=$OPTARG"
+      dbName=$(echo $OPTARG)
+      ;;
     o)
       #echo "osType=$OPTARG"
       osType=$(echo $OPTARG)
       ;;
     h)
-      echo "Usage: `basename $0` -v [cluster | edge]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta] -l [full | lite]"
+      echo "Usage: `basename $0` -v [cluster | edge]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta] -l [full | lite] -n [taos | power]"
       exit 0
       ;;
     ?) #unknow option 
@@ -52,7 +58,7 @@ do
   esac
 done
 
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} dbName=${dbName}"
 
 curr_dir=$(pwd)
 
@@ -202,9 +208,9 @@ cd ${compile_dir}
 # check support cpu type
 if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
     if [ "$verMode" != "cluster" ]; then
-      cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode}
+      cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode} -DDBNAME=${dbName}
     else
-      cmake ../../ -DCPUTYPE=${cpuType}
+      cmake ../../ -DCPUTYPE=${cpuType} -DDBNAME=${dbName}
     fi
 else
     echo "input cpuType=${cpuType} error!!!"
@@ -221,7 +227,7 @@ cd ${curr_dir}
 #echo "osinfo: ${osinfo}"
 
 if [ "$osType" != "Darwin" ]; then
-    if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]]; then
+    if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
         echo "====do deb package for the ubuntu system===="
         output_dir="${top_dir}/debs"
         if [ -d ${output_dir} ]; then
@@ -244,11 +250,11 @@ if [ "$osType" != "Darwin" ]; then
     echo "====do tar.gz package for all systems===="
     cd ${script_dir}/tools
     
-	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
-	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
 else
     cd ${script_dir}/tools
-    ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
+    ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${dbName}
 fi
 
 # 4. Clean up temporary compile directories
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index c573a2086f..cff11cd10d 100644
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -12,23 +12,23 @@ pagMode=full
 # -----------------------Variables definition---------------------
 script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
-data_dir="/var/lib/taos"
-log_dir="/var/log/taos"
+data_dir="/var/lib/DB_CLIENT_NAME"
+log_dir="/var/log/DB_CLIENT_NAME"
 
-data_link_dir="/usr/local/taos/data"
-log_link_dir="/usr/local/taos/log"
+data_link_dir="/usr/local/DB_CLIENT_NAME/data"
+log_link_dir="/usr/local/DB_CLIENT_NAME/log"
 
-cfg_install_dir="/etc/taos"
+cfg_install_dir="/etc/DB_CLIENT_NAME"
 
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
 inc_link_dir="/usr/include"
 
 #install main path
-install_main_dir="/usr/local/taos"
+install_main_dir="/usr/local/DB_CLIENT_NAME"
 
 # old bin dir
-bin_dir="/usr/local/taos/bin"
+bin_dir="/usr/local/DB_CLIENT_NAME/bin"
 
 # v1.5 jar dir
 v15_java_app_dir="/usr/local/lib/taos"
@@ -95,12 +95,12 @@ elif echo $osinfo | grep -qwi "fedora" ; then
   os_type=2
 else
   echo "${osinfo}: This is an officially unverified linux system, If there are any problems with the installation and operation, "
-  echo "please feel free to contact taosdata.com for support."
+  echo "please feel free to contact us for support."
   os_type=1
 fi
 
-function kill_taosd() {
-  pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+function kill_DB_SERVICE_NAME() {
+  pid=$(ps -ef | grep "DB_SERVICE_NAME" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo} kill -9 $pid   || :
   fi
@@ -124,20 +124,20 @@ function install_main_path() {
 
 function install_bin() {
     # Remove 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 ${bin_link_dir}/rmtaos   || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAME     || :
+    ${csudo} rm -f ${bin_link_dir}/DB_SERVICE_NAME    || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdemo || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdump || :
+    ${csudo} rm -f ${bin_link_dir}/rmDB_CLIENT_NAME   || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos             || :
-    [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd          || :
-    [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
-    [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
-    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || :
+    [ -x ${install_main_dir}/bin/DB_CLIENT_NAME ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAME ${bin_link_dir}/DB_CLIENT_NAME             || :
+    [ -x ${install_main_dir}/bin/DB_SERVICE_NAME ] && ${csudo} ln -s ${install_main_dir}/bin/DB_SERVICE_NAME ${bin_link_dir}/DB_SERVICE_NAME          || :
+    [ -x ${install_main_dir}/bin/DB_CLIENT_NAMEdump ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAMEdump ${bin_link_dir}/DB_CLIENT_NAMEdump || :
+    [ -x ${install_main_dir}/bin/DB_CLIENT_NAMEdemo ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAMEdemo ${bin_link_dir}/DB_CLIENT_NAMEdemo || :
+    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmDB_CLIENT_NAME || :
 
     if [ "$verMode" == "cluster" ]; then
         ${csudo} cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo} chmod 0555 ${nginx_dir}/*
@@ -172,16 +172,16 @@ function install_header() {
 }
 
 function install_config() {
-    #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
+    #${csudo} rm -f ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg     || :
     
-    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+    if [ ! -f ${cfg_install_dir}/DB_CLIENT_NAME.cfg ]; then
         ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ] && ${csudo} cp ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${cfg_install_dir}
         ${csudo} chmod 644 ${cfg_install_dir}/*
     fi 
     
-    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    ${csudo} cp -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg.org
+    ${csudo} ln -s ${cfg_install_dir}/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg
 
     if [ "$verMode" == "cluster" ]; then
         [ ! -z $1 ] && return 0 || : # only install client
@@ -194,14 +194,14 @@ function install_config() {
         IP_PATTERN="\b$IP_FORMAT\.$IP_FORMAT\.$IP_FORMAT\.$IP_FORMAT\b"
 
         echo
-        echo -e -n "${GREEN}Enter the IP address of an existing TDengine cluster node to join${NC} OR ${GREEN}leave it blank to build one${NC} :"
+        echo -e -n "${GREEN}Enter the IP address of an existing DB_FULL_NAME cluster node to join${NC} OR ${GREEN}leave it blank to build one${NC} :"
         read masterIp
         while true; do
             if [ ! -z "$masterIp" ]; then
                 # check the format of the masterIp
                 if [[ $masterIp =~ $IP_PATTERN ]]; then
                     # Write the first IP to configuration file
-                    sudo sed -i -r "s/#*\s*(masterIp\s*).*/\1$masterIp/" ${cfg_dir}/taos.cfg
+                    sudo sed -i -r "s/#*\s*(masterIp\s*).*/\1$masterIp/" ${cfg_dir}/DB_CLIENT_NAME.cfg
 
                     # Get the second IP address
 
@@ -213,7 +213,7 @@ function install_config() {
                         if [ ! -z "$secondIp" ]; then
                             if [[ $secondIp =~ $IP_PATTERN ]]; then
                                 # Write the second IP to configuration file
-                                sudo sed -i -r "s/#*\s*(secondIp\s*).*/\1$secondIp/" ${cfg_dir}/taos.cfg
+                                sudo sed -i -r "s/#*\s*(secondIp\s*).*/\1$secondIp/" ${cfg_dir}/DB_CLIENT_NAME.cfg
                                 break
                             else
                                 read -p "Please enter the correct IP address: " secondIp
@@ -260,22 +260,22 @@ function install_examples() {
 }
 
 function clean_service_on_sysvinit() {
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="DB_CLIENT_NAME:2345:respawn:${service_config_dir}/DB_SERVICE_NAME start"
     #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
     
-    if pidof taosd &> /dev/null; then
-        ${csudo} service taosd stop || :
+    if pidof DB_SERVICE_NAME &> /dev/null; then
+        ${csudo} service DB_SERVICE_NAME stop || :
     fi
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --del taosd || :
+        ${csudo} chkconfig --del DB_SERVICE_NAME || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv -r taosd || :
+        ${csudo} insserv -r DB_SERVICE_NAME || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d -f taosd remove || :
+        ${csudo} update-rc.d -f DB_SERVICE_NAME remove || :
     fi
     
-    ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo} rm -f ${service_config_dir}/DB_SERVICE_NAME || :
     
     if $(which init &> /dev/null); then
         ${csudo} init q || :
@@ -287,46 +287,46 @@ function install_service_on_sysvinit() {
 
     sleep 1
 
-    # Install taosd service
+    # Install DB_SERVICE_NAME service
 
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/taosd.deb ${install_main_dir}/init.d/taosd
-        ${csudo} cp    ${script_dir}/init.d/taosd.deb ${service_config_dir}/taosd && ${csudo} chmod a+x ${service_config_dir}/taosd
+        ${csudo} cp -f ${script_dir}/init.d/DB_SERVICE_NAME.deb ${install_main_dir}/init.d/DB_SERVICE_NAME
+        ${csudo} cp    ${script_dir}/init.d/DB_SERVICE_NAME.deb ${service_config_dir}/DB_SERVICE_NAME && ${csudo} chmod a+x ${service_config_dir}/DB_SERVICE_NAME
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/taosd.rpm ${install_main_dir}/init.d/taosd
-        ${csudo} cp    ${script_dir}/init.d/taosd.rpm ${service_config_dir}/taosd && ${csudo} chmod a+x ${service_config_dir}/taosd
+        ${csudo} cp -f ${script_dir}/init.d/DB_SERVICE_NAME.rpm ${install_main_dir}/init.d/DB_SERVICE_NAME
+        ${csudo} cp    ${script_dir}/init.d/DB_SERVICE_NAME.rpm ${service_config_dir}/DB_SERVICE_NAME && ${csudo} chmod a+x ${service_config_dir}/DB_SERVICE_NAME
     fi
     
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="DB_CLIENT_NAME:2345:respawn:${service_config_dir}/DB_SERVICE_NAME start"
     #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
     
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add taosd || :
-        ${csudo} chkconfig --level 2345 taosd on || :
+        ${csudo} chkconfig --add DB_SERVICE_NAME || :
+        ${csudo} chkconfig --level 2345 DB_SERVICE_NAME on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv taosd || :
-        ${csudo} insserv -d taosd || :
+        ${csudo} insserv DB_SERVICE_NAME || :
+        ${csudo} insserv -d DB_SERVICE_NAME || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d taosd defaults || :
+        ${csudo} update-rc.d DB_SERVICE_NAME defaults || :
     fi
 }
 
 function clean_service_on_systemd() {
-    taosd_service_config="${service_config_dir}/taosd.service"
+    DB_SERVICE_NAME_service_config="${service_config_dir}/DB_SERVICE_NAME.service"
 
-    if systemctl is-active --quiet taosd; then
-        echo "TDengine is running, stopping it..."
-        ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null
+    if systemctl is-active --quiet DB_SERVICE_NAME; then
+        echo "DB_FULL_NAME is running, stopping it..."
+        ${csudo} systemctl stop DB_SERVICE_NAME &> /dev/null || echo &> /dev/null
     fi
-    ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
+    ${csudo} systemctl disable DB_SERVICE_NAME &> /dev/null || echo &> /dev/null
 
-    ${csudo} rm -f ${taosd_service_config}
+    ${csudo} rm -f ${DB_SERVICE_NAME_service_config}
 
     if [ "$verMode" == "cluster" ]; then
         nginx_service_config="${service_config_dir}/nginxd.service"
 	
         if systemctl is-active --quiet nginxd; then
-            echo "Nginx for TDengine is running, stopping it..."
+            echo "Nginx for DB_FULL_NAME is running, stopping it..."
             ${csudo} systemctl stop nginxd &> /dev/null || echo &> /dev/null
         fi
         ${csudo} systemctl disable nginxd &> /dev/null || echo &> /dev/null
@@ -335,38 +335,38 @@ function clean_service_on_systemd() {
 	fi
 }
 
-# taos:2345:respawn:/etc/init.d/taosd start
+# DB_CLIENT_NAME:2345:respawn:/etc/init.d/DB_SERVICE_NAME start
 
 function install_service_on_systemd() {
     clean_service_on_systemd
 
-    taosd_service_config="${service_config_dir}/taosd.service"
-
-    ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
-    ${csudo} systemctl enable taosd
+    DB_SERVICE_NAME_service_config="${service_config_dir}/DB_SERVICE_NAME.service"
+
+    ${csudo} bash -c "echo '[Unit]'                             >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'Description=DB_FULL_NAME server service' >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'        >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo                                      >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo '[Service]'                          >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                        >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/DB_SERVICE_NAME' >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                     >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo                                      >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo '[Install]'                          >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${DB_SERVICE_NAME_service_config}"
+    ${csudo} systemctl enable DB_SERVICE_NAME
 
     if [ "$verMode" == "cluster" ]; then		
         nginx_service_config="${service_config_dir}/nginxd.service"
         ${csudo} bash -c "echo '[Unit]'                             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Description=Nginx For TDengine Service' >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Description=Nginx For DB_FULL_NAME Service' >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'After=network-online.target'        >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${nginx_service_config}"
         ${csudo} bash -c "echo                                      >> ${nginx_service_config}"
@@ -400,8 +400,8 @@ function install_service() {
     elif ((${service_mod}==1)); then
         install_service_on_sysvinit
     else
-        # must manual stop taosd
-        kill_taosd
+        # must manual stop DB_SERVICE_NAME
+        kill_DB_SERVICE_NAME
     fi
 }
 
@@ -436,9 +436,9 @@ vercomp () {
 
 function is_version_compatible() {
 
-    curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 3)
+    curr_version=$(${bin_dir}/DB_SERVICE_NAME -V | head -1 | cut -d ' ' -f 3)
 
-    min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 5)
+    min_compatible_version=$(${script_dir}/bin/DB_SERVICE_NAME -V | head -1 | cut -d ' ' -f 5)
 
     vercomp $curr_version $min_compatible_version
     case $? in
@@ -448,13 +448,13 @@ function is_version_compatible() {
     esac
 }
 
-function update_TDengine() {
+function update_DB_FULL_NAME() {
     # Start to update
-    if [ ! -e taos.tar.gz ]; then
-        echo "File taos.tar.gz does not exist"
+    if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
+        echo "File DB_CLIENT_NAME.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz
+    tar -zxf DB_CLIENT_NAME.tar.gz
 
     # Check if version compatible
     if ! is_version_compatible; then
@@ -462,15 +462,15 @@ function update_TDengine() {
         return 1
     fi
 
-    echo -e "${GREEN}Start to update TDengine...${NC}"
+    echo -e "${GREEN}Start to update DB_FULL_NAME...${NC}"
     # Stop the service if running
-    if pidof taosd &> /dev/null; then
+    if pidof DB_SERVICE_NAME &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop taosd || :
+            ${csudo} systemctl stop DB_SERVICE_NAME || :
         elif ((${service_mod}==1)); then
-            ${csudo} service taosd stop || :
+            ${csudo} service DB_SERVICE_NAME stop || :
         else
-            kill_taosd
+            kill_DB_SERVICE_NAME
         fi
         sleep 1
     fi
@@ -496,57 +496,57 @@ function update_TDengine() {
             # Check if nginx is installed successfully
             if type curl &> /dev/null; then
                 if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
-                    echo -e "\033[44;32;1mNginx for TDengine is updated successfully!${NC}"
+                    echo -e "\033[44;32;1mNginx for DB_FULL_NAME is updated successfully!${NC}"
                     openresty_work=true
                 else
-                    echo -e "\033[44;31;5mNginx for TDengine does not work! Please try again!\033[0m"
+                    echo -e "\033[44;31;5mNginx for DB_FULL_NAME does not work! Please try again!\033[0m"
                 fi
             fi
 		fi 
 
         echo
-        echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME is updated successfully!${NC}"
         echo
-        echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
+        echo -e "${GREEN_DARK}To configure DB_FULL_NAME ${NC}: edit /etc/DB_CLIENT_NAME/DB_CLIENT_NAME.cfg"
         if ((${service_mod}==0)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: ${csudo} systemctl start DB_SERVICE_NAME${NC}"
         elif ((${service_mod}==1)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: ${csudo} service DB_SERVICE_NAME start${NC}"
         else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: ./DB_SERVICE_NAME${NC}"
         fi
 
         if [ "$verMode" == "cluster" ]; then  
             if [ ${openresty_work} = 'true' ]; then
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+                echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
             else
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+                echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell${NC}"
             fi
         else
-		    echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+		    echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell${NC}"
         fi
         echo
-        echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME is updated successfully!${NC}"
     else
         install_bin
         install_config
 
         echo
-        echo -e "\033[44;32;1mTDengine client is updated successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME client is updated successfully!${NC}"
     fi
 
-    rm -rf $(tar -tf taos.tar.gz)
+    rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
 }
 
-function install_TDengine() {
+function install_DB_FULL_NAME() {
     # Start to install
-    if [ ! -e taos.tar.gz ]; then
-        echo "File taos.tar.gz does not exist"
+    if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
+        echo "File DB_CLIENT_NAME.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz
+    tar -zxf DB_CLIENT_NAME.tar.gz
 
-    echo -e "${GREEN}Start to install TDengine...${NC}"
+    echo -e "${GREEN}Start to install DB_FULL_NAME...${NC}"
     
 	  install_main_path
 	   
@@ -572,10 +572,10 @@ function install_TDengine() {
             # Check if nginx is installed successfully
             if type curl &> /dev/null; then
                 if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
-                    echo -e "\033[44;32;1mNginx for TDengine is installed successfully!${NC}"
+                    echo -e "\033[44;32;1mNginx for DB_FULL_NAME is installed successfully!${NC}"
                     openresty_work=true
                 else
-                    echo -e "\033[44;31;5mNginx for TDengine does not work! Please try again!\033[0m"
+                    echo -e "\033[44;31;5mNginx for DB_FULL_NAME does not work! Please try again!\033[0m"
                 fi
             fi
         fi
@@ -584,56 +584,56 @@ function install_TDengine() {
 
         # Ask if to start the service
         echo
-        echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME is installed successfully!${NC}"
         echo
-        echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
+        echo -e "${GREEN_DARK}To configure DB_FULL_NAME ${NC}: edit /etc/DB_CLIENT_NAME/DB_CLIENT_NAME.cfg"
         if ((${service_mod}==0)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: ${csudo} systemctl start DB_SERVICE_NAME${NC}"
         elif ((${service_mod}==1)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: ${csudo} service DB_SERVICE_NAME start${NC}"
         else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: taosd${NC}"
+            echo -e "${GREEN_DARK}To start DB_FULL_NAME     ${NC}: DB_SERVICE_NAME${NC}"
         fi
 		
         if [ "$verMode" == "cluster" ]; then  
            if [ ${openresty_work} = 'true' ]; then
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+                echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
            else
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+                echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell${NC}"
             fi
 		else
-            echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+            echo -e "${GREEN_DARK}To access DB_FULL_NAME    ${NC}: use ${GREEN_UNDERLINE}DB_CLIENT_NAME${NC} in shell${NC}"
         fi
 		
         echo
-        echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME is installed successfully!${NC}"
     else # Only install client
         install_bin
         install_config
 
         echo
-        echo -e "\033[44;32;1mTDengine client is installed successfully!${NC}"
+        echo -e "\033[44;32;1mDB_FULL_NAME client is installed successfully!${NC}"
     fi
 
-    rm -rf $(tar -tf taos.tar.gz)
+    rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
 }
 
 
 ## ==============================Main program starts from here============================
 if [ -z $1 ]; then
     # Install server and client
-    if [ -x ${bin_dir}/taosd ]; then
+    if [ -x ${bin_dir}/DB_SERVICE_NAME ]; then
         update_flag=1
-        update_TDengine
+        update_DB_FULL_NAME
     else
-        install_TDengine
+        install_DB_FULL_NAME
     fi
 else
     # Only install client
-    if [ -x ${bin_dir}/taos ]; then
+    if [ -x ${bin_dir}/DB_CLIENT_NAME ]; then
         update_flag=1
-        update_TDengine client
+        update_DB_FULL_NAME client
     else
-        install_TDengine client
+        install_DB_FULL_NAME client
     fi
 fi
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 605944e9b3..9151b3170c 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This file is used to install TDengine client on linux systems. The operating system
+# This file is used to install DB_FULL_NAME client on linux systems. The operating system
 # is required to use systemd to manage services at boot
 
 set -e
@@ -14,19 +14,19 @@ pagMode=full
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
     # Dynamic directory
-    data_dir="/var/lib/taos"
-    log_dir="/var/log/taos"
+    data_dir="/var/lib/DB_CLIENT_NAME"
+    log_dir="/var/log/DB_CLIENT_NAME"
 else
     script_dir=`dirname $0`
     cd ${script_dir}
     script_dir="$(pwd)"
-    data_dir="/var/lib/taos"
+    data_dir="/var/lib/DB_CLIENT_NAME"
     log_dir="~/TDengineLog"
 fi
 
-log_link_dir="/usr/local/taos/log"
+log_link_dir="/usr/local/DB_CLIENT_NAME/log"
 
-cfg_install_dir="/etc/taos"
+cfg_install_dir="/etc/DB_CLIENT_NAME"
 
 if [ "$osType" != "Darwin" ]; then
     bin_link_dir="/usr/bin"
@@ -39,10 +39,10 @@ else
 fi
 
 #install main path
-install_main_dir="/usr/local/taos"
+install_main_dir="/usr/local/DB_CLIENT_NAME"
 
 # old bin dir
-bin_dir="/usr/local/taos/bin"
+bin_dir="/usr/local/DB_CLIENT_NAME/bin"
 
 # v1.5 jar dir
 v15_java_app_dir="/usr/local/lib/taos"
@@ -62,7 +62,7 @@ fi
 update_flag=0
 
 function kill_client() {
-  pid=$(ps -ef | grep "taos" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep "DB_CLIENT_NAME" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo} kill -9 $pid   || :
   fi
@@ -82,20 +82,20 @@ function install_main_path() {
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/taos         || :
+  ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAME         || :
   if [ "$osType" == "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/taosdump || :
+      ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdump || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmtaos       || :
+  ${csudo} rm -f ${bin_link_dir}/rmDB_CLIENT_NAME       || :
 
   ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-  [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                 || :
+  [ -x ${install_main_dir}/bin/DB_CLIENT_NAME ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAME ${bin_link_dir}/DB_CLIENT_NAME                 || :
   if [ "$osType" == "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+      [ -x ${install_main_dir}/bin/DB_CLIENT_NAMEdump ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAMEdump ${bin_link_dir}/DB_CLIENT_NAMEdump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
+  [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmDB_CLIENT_NAME || :
 }
 
 function clean_lib() {
@@ -127,16 +127,16 @@ function install_header() {
 }
 
 function install_config() {
-    #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
+    #${csudo} rm -f ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg     || :
 
-    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+    if [ ! -f ${cfg_install_dir}/DB_CLIENT_NAME.cfg ]; then
         ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ] && ${csudo} cp ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${cfg_install_dir}
         ${csudo} chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    ${csudo} cp -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg.org
+    ${csudo} ln -s ${cfg_install_dir}/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg
 }
 
 
@@ -161,17 +161,17 @@ function install_examples() {
     fi
 }
 
-function update_TDengine() {
+function update_DB_FULL_NAME() {
     # Start to update
-    if [ ! -e taos.tar.gz ]; then
-        echo "File taos.tar.gz does not exist"
+    if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
+        echo "File DB_CLIENT_NAME.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz
+    tar -zxf DB_CLIENT_NAME.tar.gz
 
-    echo -e "${GREEN}Start to update TDengine client...${NC}"
+    echo -e "${GREEN}Start to update DB_FULL_NAME client...${NC}"
     # Stop the client shell if running
-    if pidof taos &> /dev/null; then
+    if pidof DB_CLIENT_NAME &> /dev/null; then
         kill_client
         sleep 1
     fi
@@ -189,20 +189,20 @@ function update_TDengine() {
     install_config
 
     echo
-    echo -e "\033[44;32;1mTDengine client is updated successfully!${NC}"
+    echo -e "\033[44;32;1mDB_FULL_NAME client is updated successfully!${NC}"
 
-    rm -rf $(tar -tf taos.tar.gz)
+    rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
 }
 
-function install_TDengine() {
+function install_DB_FULL_NAME() {
     # Start to install
-    if [ ! -e taos.tar.gz ]; then
-        echo "File taos.tar.gz does not exist"
+    if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
+        echo "File DB_CLIENT_NAME.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz
+    tar -zxf DB_CLIENT_NAME.tar.gz
 
-    echo -e "${GREEN}Start to install TDengine client...${NC}"
+    echo -e "${GREEN}Start to install DB_FULL_NAME client...${NC}"
 
 	install_main_path
     install_log
@@ -216,23 +216,23 @@ function install_TDengine() {
     install_config
 
     echo
-    echo -e "\033[44;32;1mTDengine client is installed successfully!${NC}"
+    echo -e "\033[44;32;1mDB_FULL_NAME client client is installed successfully!${NC}"
 
-    rm -rf $(tar -tf taos.tar.gz)
+    rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
 }
 
 
 ## ==============================Main program starts from here============================
 # Install or updata client and client
 # if server is already install, don't install client
-  if [ -e ${bin_dir}/taosd ]; then
-      echo -e "\033[44;32;1mThere are already installed TDengine server, so don't need install client!${NC}"
+  if [ -e ${bin_dir}/DB_SERVICE_NAME ]; then
+      echo -e "\033[44;32;1mThere are already installed DB_FULL_NAME client server, so don't need install client!${NC}"
       exit 0
   fi
 
-  if [ -x ${bin_dir}/taos ]; then
+  if [ -x ${bin_dir}/DB_CLIENT_NAME ]; then
       update_flag=1
-      update_TDengine
+      update_DB_FULL_NAME client
   else
-      install_TDengine
+      install_DB_FULL_NAME client
   fi
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 6120f9fcc2..5c516fa64a 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -13,6 +13,24 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+dbName=$9
+
+if [ "$dbName" == "taos" ]; then
+  DB_CLIENT_NAME="taos"
+  DB_SERVICE_NAME="taosd"
+  DB_FULL_NAME="TDengine"
+  DB_COPYRIGHT="TAOS Data"
+  DB_COMPANY="taosdata" 
+elif [ "$dbName" == "power" ]; then
+  DB_CLIENT_NAME="power"
+  DB_SERVICE_NAME="powerd"
+  DB_FULL_NAME="PowerDB"
+  DB_COPYRIGHT="PowerDB"
+  DB_COMPANY="powerdb"   
+else
+  echo "Not support dbname, exit"
+  exit 1
+fi
 
 if [ "$osType" != "Darwin" ]; then
     script_dir="$(dirname $(readlink -f $0))"
@@ -32,24 +50,24 @@ release_dir="${top_dir}/release"
 #package_name='linux'
 
 if [ "$verMode" == "cluster" ]; then
-    install_dir="${release_dir}/TDengine-enterprise-client"
+    install_dir="${release_dir}/${DB_FULL_NAME}-enterprise-client"
 else
-    install_dir="${release_dir}/TDengine-client"
+    install_dir="${release_dir}/${DB_FULL_NAME}-client"
 fi
 
 # Directories and files.
 
 if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
-    strip ${build_dir}/bin/taosd 
-    strip ${build_dir}/bin/taos
-    bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+    strip ${build_dir}/bin/${DB_SERVICE_NAME} 
+    strip ${build_dir}/bin/${DB_CLIENT_NAME}
+    bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove_client.sh"
   else  
-    bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh"
+    bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove_client.sh"
   fi
   lib_files="${build_dir}/lib/libtaos.so.${version}"
 else
-  bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+  bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove_client.sh"
   lib_files="${build_dir}/lib/libtaos.${version}.dylib"
 fi
 
@@ -61,18 +79,22 @@ install_files="${script_dir}/install_client.sh"
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
 
+sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/bin/remove_client.sh
+sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/bin/remove_client.sh
+sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/bin/remove_client.sh
+
 cd ${install_dir}
 
 if [ "$osType" != "Darwin" ]; then
-    tar -zcv -f taos.tar.gz * --remove-files || :
+    tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * --remove-files || :
 else
-    tar -zcv -f taos.tar.gz * || :
-    mv taos.tar.gz ..
+    tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * || :
+    mv ${DB_CLIENT_NAME}.tar.gz ..
     rm -rf ./*
-    mv ../taos.tar.gz .
+    mv ../${DB_CLIENT_NAME}.tar.gz .
 fi
 
 cd ${curr_dir}
@@ -85,6 +107,11 @@ if [ "$pagMode" == "lite" ]; then
     sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >> install_client_temp.sh
     mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
+
+sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/install_client.sh
+sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/install_client.sh
+sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/install_client.sh
+
 chmod a+x ${install_dir}/install_client.sh
 
 # Copy example code
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index d39cf41843..0c9f6aea9d 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -14,6 +14,24 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+dbName=$9
+
+if [ "$dbName" == "taos" ]; then
+  DB_CLIENT_NAME="taos"
+  DB_SERVICE_NAME="taosd"
+  DB_FULL_NAME="TDengine"
+  DB_COPYRIGHT="TAOS Data"
+  DB_COMPANY="taosdata" 
+elif [ "$dbName" == "power" ]; then
+  DB_CLIENT_NAME="power"
+  DB_SERVICE_NAME="powerd"
+  DB_FULL_NAME="PowerDB"
+  DB_COPYRIGHT="PowerDB"
+  DB_COMPANY="powerdb"   
+else
+  echo "Not support dbname: ${dbName}, exit"
+  exit 1
+fi
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
@@ -25,18 +43,18 @@ release_dir="${top_dir}/release"
 
 #package_name='linux'
 if [ "$verMode" == "cluster" ]; then
-    install_dir="${release_dir}/TDengine-enterprise-server"
+    install_dir="${release_dir}/${DB_FULL_NAME}-enterprise-server"
 else
-    install_dir="${release_dir}/TDengine-server"
+    install_dir="${release_dir}/${DB_FULL_NAME}-server"
 fi
 
 # Directories and files.
 if [ "$pagMode" == "lite" ]; then
   strip ${build_dir}/bin/taosd 
   strip ${build_dir}/bin/taos
-  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh"
+  bin_files="${build_dir}/bin/${DB_SERVICE_NAME} ${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove.sh"
 else 
-  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh"
+  bin_files="${build_dir}/bin/${DB_SERVICE_NAME} ${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}demo ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove.sh"
 fi
 
 lib_files="${build_dir}/lib/libtaos.so.${version}"
@@ -58,19 +76,51 @@ init_file_rpm=${script_dir}/../rpm/taosd
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
-mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/taosd.deb
-mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm
+mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
+mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
 
 if [ "$verMode" == "cluster" ]; then
     sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
     mv remove_temp.sh ${install_dir}/bin/remove.sh
     
     mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
-    cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
+    cp ${nginx_dir}/png/${DB_CLIENT_NAME}.png ${install_dir}/nginxd/admin/images/${DB_CLIENT_NAME}.png
     rm -rf ${install_dir}/nginxd/png
 
+    sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/nginxd/admin/*.html
+    sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/nginxd/admin/*.html
+    sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/nginxd/admin/*.html
+    sed -i "s/DB_COPYRIGHT/${DB_COPYRIGHT}/g"       ${install_dir}/nginxd/admin/*.html
+    sed -i "s/DB_COMPANY/${DB_COMPANY}/g"           ${install_dir}/nginxd/admin/*.html
+    
+    sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/nginxd/admin/js/*.js
+    sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/nginxd/admin/js/*.js
+    sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/nginxd/admin/js/*.js
+    sed -i "s/DB_COPYRIGHT/${DB_COPYRIGHT}/g"       ${install_dir}/nginxd/admin/js/*.js
+    sed -i "s/DB_COMPANY/${DB_COMPANY}/g"           ${install_dir}/nginxd/admin/js/*.js
+    
+    sed -i "s/taosdata/${DB_COMPANY}/g"              ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
+    sed -i "s/taos/${DB_CLIENT_NAME}/g"              ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
+    sed -i "s/TDengine/${DB_FULL_NAME}/g"            ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
+    
+    sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/bin/remove.sh
+    sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/bin/remove.sh
+    sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/bin/remove.sh
+    
+    sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
+    sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
+    sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
+    
+    sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
+    sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
+    sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
+    
+    #sed -i "s/TAOS Data/${DB_COPYRIGHT}/g"           ${install_dir}/inc/${DB_CLIENT_NAME}.h
+    #sed -i "s/taosdata/${DB_COMPANY}/g"              ${install_dir}/inc/${DB_CLIENT_NAME}.h
+
+
     if [ "$cpuType" == "aarch64" ]; then
         cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
     elif [ "$cpuType" == "aarch32" ]; then
@@ -80,10 +130,10 @@ if [ "$verMode" == "cluster" ]; then
 fi
 
 cd ${install_dir}
-tar -zcv -f taos.tar.gz * --remove-files  || :
+tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * --remove-files  || :
 exitcode=$?
 if [ "$exitcode" != "0" ]; then
-    echo "tar taos.tar.gz error !!!"
+    echo "tar ${DB_CLIENT_NAME}.tar.gz error !!!"
     exit $exitcode
 fi
 
@@ -97,6 +147,11 @@ if [ "$pagMode" == "lite" ]; then
     sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh
     mv install_temp.sh ${install_dir}/install.sh
 fi
+
+sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/install.sh
+sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/install.sh
+sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/install.sh
+
 chmod a+x ${install_dir}/install.sh
 
 # Copy example code
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 28cc835f30..09081b19b5 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to stop the service and uninstall TDengine, but retain the config, data and log files.
+# Script to stop the service and uninstall database, but retain the config, data and log files.
 
 set -e
 #set -x
@@ -12,10 +12,10 @@ GREEN='\033[1;32m'
 NC='\033[0m'
 
 #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"
+install_main_dir="/usr/local/DB_CLIENT_NAME"
+data_link_dir="/usr/local/DB_CLIENT_NAME/data"
+log_link_dir="/usr/local/DB_CLIENT_NAME/log"
+cfg_link_dir="/usr/local/DB_CLIENT_NAME/cfg"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
 inc_link_dir="/usr/include"
@@ -25,7 +25,7 @@ install_nginxd_dir="/usr/local/nginxd"
 v15_java_app_dir="/usr/local/lib/taos"
 
 service_config_dir="/etc/systemd/system"
-taos_service_name="taosd"
+DB_CLIENT_NAME_service_name="DB_SERVICE_NAME"
 nginx_service_name="nginxd"
 csudo=""
 if command -v sudo > /dev/null; then
@@ -52,8 +52,8 @@ else
     service_mod=2
 fi
 
-function kill_taosd() {
-  pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+function kill_DB_SERVICE_NAME() {
+  pid=$(ps -ef | grep "DB_SERVICE_NAME" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo} kill -9 $pid   || :
   fi
@@ -61,11 +61,11 @@ function kill_taosd() {
 
 function clean_bin() {
     # Remove link
-    ${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 ${bin_link_dir}/rmtaos    || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAME      || :
+    ${csudo} rm -f ${bin_link_dir}/DB_SERVICE_NAME     || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdemo  || :
+    ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdump  || :
+    ${csudo} rm -f ${bin_link_dir}/rmDB_CLIENT_NAME    || :
 }
 
 function clean_lib() {
@@ -91,22 +91,22 @@ function clean_log() {
 }
 
 function clean_service_on_systemd() {
-    taosd_service_config="${service_config_dir}/${taos_service_name}.service"
+    DB_SERVICE_NAME_service_config="${service_config_dir}/${DB_CLIENT_NAME_service_name}.service"
 
-    if systemctl is-active --quiet ${taos_service_name}; then
-        echo "TDengine taosd is running, stopping it..."
-        ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
+    if systemctl is-active --quiet ${DB_CLIENT_NAME_service_name}; then
+        echo "DB_FULL_NAME DB_SERVICE_NAME is running, stopping it..."
+        ${csudo} systemctl stop ${DB_CLIENT_NAME_service_name} &> /dev/null || echo &> /dev/null
     fi
-    ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
+    ${csudo} systemctl disable ${DB_CLIENT_NAME_service_name} &> /dev/null || echo &> /dev/null
 
-    ${csudo} rm -f ${taosd_service_config}
+    ${csudo} rm -f ${DB_SERVICE_NAME_service_config}
 
     if [ "$verMode" == "cluster" ]; then
 		nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
 	
    	 	if [ -d ${bin_dir}/web ]; then
    	        if systemctl is-active --quiet ${nginx_service_name}; then
-   	            echo "Nginx for TDengine is running, stopping it..."
+   	            echo "Nginx for DB_FULL_NAME is running, stopping it..."
    	            ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
    	        fi
    	        ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
@@ -117,23 +117,23 @@ function clean_service_on_systemd() {
 }
 
 function clean_service_on_sysvinit() {
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="DB_CLIENT_NAME:2345:respawn:${service_config_dir}/DB_SERVICE_NAME start"
     #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
     
-    if pidof taosd &> /dev/null; then
-        echo "TDengine taosd is running, stopping it..."
-        ${csudo} service taosd stop || :
+    if pidof DB_SERVICE_NAME &> /dev/null; then
+        echo "DB_FULL_NAME DB_SERVICE_NAME is running, stopping it..."
+        ${csudo} service DB_SERVICE_NAME stop || :
     fi
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --del taosd || :
+        ${csudo} chkconfig --del DB_SERVICE_NAME || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv -r taosd || :
+        ${csudo} insserv -r DB_SERVICE_NAME || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d -f taosd remove || :
+        ${csudo} update-rc.d -f DB_SERVICE_NAME remove || :
     fi
     
-    ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo} rm -f ${service_config_dir}/DB_SERVICE_NAME || :
    
     if $(which init &> /dev/null); then
         ${csudo} init q || :
@@ -146,8 +146,8 @@ function clean_service() {
     elif ((${service_mod}==1)); then
         clean_service_on_sysvinit
     else
-        # must manual stop taosd
-        kill_taosd
+        # must manual stop DB_SERVICE_NAME
+        kill_DB_SERVICE_NAME
     fi
 }
 
@@ -178,4 +178,4 @@ elif  echo $osinfo | grep -qwi "centos" ; then
   ${csudo} rpm -e --noscripts tdengine || :
 fi
 
-echo -e "${GREEN}TDengine is removed successfully!${NC}"
+echo -e "${GREEN}DB_FULL_NAME is removed successfully!${NC}"
diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt
index 0f490c58b1..1845078b69 100644
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -18,7 +18,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
     TARGET_LINK_LIBRARIES(shell taos_static)
   ENDIF ()
   
-  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
+  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
 ELSEIF (TD_WINDOWS_64)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
@@ -27,7 +27,7 @@ ELSEIF (TD_WINDOWS_64)
   LIST(APPEND SRC ./src/shellWindows.c)
   ADD_EXECUTABLE(shell ${SRC})
   TARGET_LINK_LIBRARIES(shell taos_static)
-  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
+  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
 ELSEIF (TD_DARWIN_64)
   LIST(APPEND SRC ./src/shellEngine.c)
   LIST(APPEND SRC ./src/shellMain.c)
@@ -36,6 +36,6 @@ ELSEIF (TD_DARWIN_64)
   LIST(APPEND SRC ./src/shellImport.c)
   ADD_EXECUTABLE(shell ${SRC})
   TARGET_LINK_LIBRARIES(shell taos_static)
-  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
+  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
 ENDIF ()
 
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index d47e6a06df..037e9b5a49 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc)
 
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
-  ADD_EXECUTABLE(taosdemo ${SRC})
+  ADD_EXECUTABLE(${DB_CLIENT_NAME}demo ${SRC})
   
   IF (TD_PAGMODE_LITE)
-    TARGET_LINK_LIBRARIES(taosdemo taos)
+    TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}demo taos)
   ELSE ()
-    TARGET_LINK_LIBRARIES(taosdemo taos_static)
+    TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}demo taos_static)
   ENDIF ()
   
 ENDIF ()
diff --git a/src/kit/taosdump/CMakeLists.txt b/src/kit/taosdump/CMakeLists.txt
index e7269eecdd..abbab76ad7 100644
--- a/src/kit/taosdump/CMakeLists.txt
+++ b/src/kit/taosdump/CMakeLists.txt
@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc)
 
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
-  ADD_EXECUTABLE(taosdump ${SRC})
+  ADD_EXECUTABLE(${DB_CLIENT_NAME}dump ${SRC})
   
 #  IF (TD_PAGMODE_LITE)
-    TARGET_LINK_LIBRARIES(taosdump taos)
+    TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}dump taos)
 #  ELSE ()
-#    TARGET_LINK_LIBRARIES(taosdump taos_static)
+#    TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}dump taos_static)
 #  ENDIF ()  
   
   
diff --git a/src/system/detail/CMakeLists.txt b/src/system/detail/CMakeLists.txt
index 6268b97f91..249a9eb148 100644
--- a/src/system/detail/CMakeLists.txt
+++ b/src/system/detail/CMakeLists.txt
@@ -14,18 +14,18 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   LIST(REMOVE_ITEM SRC ./src/vnodeFileUtil.c)
   LIST(REMOVE_ITEM SRC ./src/taosGrant.c)
 
-  ADD_EXECUTABLE(taosd ${SRC})
+  ADD_EXECUTABLE(${DB_SERVICE_NAME} ${SRC})
 
   IF (TD_PAGMODE_LITE)
-    TARGET_LINK_LIBRARIES(taosd taos trpc tutil sdb monitor pthread http)
+    TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taos trpc tutil sdb monitor pthread http)
   ELSE ()
-    TARGET_LINK_LIBRARIES(taosd taos_static trpc tutil sdb monitor pthread http)
+    TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taos_static trpc tutil sdb monitor pthread http)
   ENDIF ()
 
   IF (TD_EDGE)
-    TARGET_LINK_LIBRARIES(taosd taosd_edge)
+    TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taosd_edge)
   ELSE ()
-    TARGET_LINK_LIBRARIES(taosd taosd_cluster)
+    TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taosd_cluster)
   ENDIF ()
 
   SET(PREPARE_ENV_CMD "prepare_env_cmd")
@@ -33,14 +33,14 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
     POST_BUILD 
     COMMAND echo "make test directory"
-    DEPENDS taosd
+    DEPENDS ${DB_SERVICE_NAME}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
     COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
     COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
     COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
     COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
     COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-    COMMENT "prepare taosd environment")
+    COMMENT "prepare ${DB_SERVICE_NAME} environment")
   ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
 
 ENDIF ()
-- 
GitLab