kinghistorian release scripts modify

packaging/release.sh

@@ -385,9 +385,14 @@ if [[ "$dbName" == "kh" ]]; then
   # src/kit/shell/src/shellEngine.c
   sed -i "s/TDengine shell/KingHistorian shell/g" ${top_dir}/src/kit/shell/src/shellEngine.c
   sed -i "s/2020 by TAOS Data, Inc/2021 by Wellintech, Inc/g" ${top_dir}/src/kit/shell/src/shellEngine.c
-  sed -i "s/\"taos> \"/\"kh> \"/g" ${top_dir}/src/kit/shell/src/shellEngine.c
+  sed -i "s/taos connect failed/kh connect failed/g" ${top_dir}/src/kit/shell/src/shellEngine.c
+  sed -i "s/\"taos> \"/\"khclient> \"/g" ${top_dir}/src/kit/shell/src/shellEngine.c
   sed -i "s/\"   -> \"/\" -> \"/g" ${top_dir}/src/kit/shell/src/shellEngine.c
   sed -i "s/prompt_size = 6/prompt_size = 4/g" ${top_dir}/src/kit/shell/src/shellEngine.c
+  # src/rpc/src/rpcMain.c
+  sed -i "s/taos connections/kh connections/g" ${top_dir}/src/rpc/src/rpcMain.c
+  # src/plugins/monitor/src/monMain.c
+  sed -i "s/taosd is quiting/khserver is quiting/g" ${top_dir}/src/plugins/monitor/src/monMain.c
 fi
 
 

packaging/tools/makeclient_kh.sh

@@ -63,6 +63,7 @@ mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/kinghis
 sed -i '/dataDir/ {s/taos/kinghistorian/g}'  ${install_dir}/cfg/kinghistorian.cfg
 sed -i '/logDir/  {s/taos/kinghistorian/g}'  ${install_dir}/cfg/kinghistorian.cfg
 sed -i "s/TDengine/KingHistorian/g"        ${install_dir}/cfg/kinghistorian.cfg
+sed -i "s/TAOS/KingHistorian/g"      ${install_dir}/cfg/kinghistorian.cfg
 
 mkdir -p ${install_dir}/bin
 if [ "$osType" != "Darwin" ]; then

packaging/tools/makepkg_kh.sh

@@ -74,7 +74,6 @@ if [ "$verMode" == "cluster" ]; then
     cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
     rm -rf ${install_dir}/nginxd/png
 
-    # replace the OEM name, add by yangzy@2021-09-22
     sed -i -e 's/www.taosdata.com/www.wellintech.com/g' $(grep -r 'www.taosdata.com' ${install_dir}/nginxd | sed -r "s/(.*\.html):\s*(.*)/\1/g")
     sed -i -e 's/2017/2021/g' $(grep -r '2017' ${install_dir}/nginxd | sed -r "s/(.*\.html):\s*(.*)/\1/g")
     sed -i -e 's/TAOS Data/Wellintech/g' $(grep -r 'TAOS Data' ${install_dir}/nginxd | sed -r "s/(.*\.html):\s*(.*)/\1/g")
@@ -99,6 +98,7 @@ sed -i "s/TDengine/KingHistorian/g"     ${install_dir}/cfg/kinghistorian.cfg
 sed -i "s/support@taosdata.com/support@wellintech.com/g"      ${install_dir}/cfg/kinghistorian.cfg
 sed -i "s/taos client/khclient/g"      ${install_dir}/cfg/kinghistorian.cfg
 sed -i "s/taosd/khserver/g"      ${install_dir}/cfg/kinghistorian.cfg
+sed -i "s/TAOS/KingHistorian/g"      ${install_dir}/cfg/kinghistorian.cfg
 
 cd ${install_dir}
 tar -zcv -f kinghistorian.tar.gz * --remove-files  || :

src/kit/shell/src/shellEngine.c

@@ -53,11 +53,11 @@ char      CONTINUE_PROMPT[] = "    -> ";
 int       prompt_size = 7;
 #elif (_TD_KH_ == true)
 char      CLIENT_VERSION[] = "Welcome to the KingHistorian shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2021 by Hanatech, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "kh> ";
+                             "Copyright (c) 2021 by Wellintech, Inc. All rights reserved.\n\n";
+char      PROMPT_HEADER[] = "khclient> ";
 
-char      CONTINUE_PROMPT[] = " -> ";
-int       prompt_size = 4;
+char      CONTINUE_PROMPT[] = "       -> ";
+int       prompt_size = 10;
 #else
 char      CLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
                              "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
@@ -118,7 +118,11 @@ TAOS *shellInit(SShellArguments *_args) {
   }
 
   if (con == NULL) {
+#ifdef _TD_KH_
+    printf("kh connect failed, reason: %s.\n\n", tstrerror(terrno));
+#else
     printf("taos connect failed, reason: %s.\n\n", tstrerror(terrno));
+#endif
     fflush(stdout);
     return con;
   }

src/plugins/monitor/src/monMain.c

@@ -123,7 +123,11 @@ static void *monThreadFunc(void *param) {
 
     if (tsMonitor.quiting) {
       tsMonitor.state = MON_STATE_NOT_INIT;
+#ifdef _TD_KH_
+      monInfo("monitor thread will quit, for khserver is quiting");
+#else
       monInfo("monitor thread will quit, for taosd is quiting");
+#endif
       break;
     } else {
       taosGetDisk();