From 58beacdcfab25435be8f7624047fdb1b60c1ac26 Mon Sep 17 00:00:00 2001 From: zyyang-taosdata Date: Fri, 10 Dec 2021 14:35:12 +0800 Subject: [PATCH] [TS-848]: release script modify --- packaging/release.sh | 8 +++++++- src/kit/shell/src/shellDarwin.c | 4 ++-- src/kit/shell/src/shellLinux.c | 4 ++-- src/kit/shell/src/shellWindows.c | 22 ++++++++++++++++++++-- src/kit/taosdemo/taosdemo.c | 2 +- src/util/src/tconfig.c | 6 +++--- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/packaging/release.sh b/packaging/release.sh index 79687e91f9..f62eaa2743 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -363,7 +363,7 @@ if [[ "$dbName" == "kh" ]]; then sed -i "s/taosinfo/khinfo/g" ${top_dir}/src/util/src/tnote.c # src/dnode/CMakeLists.txt sed -i "s/taos\.cfg/kinghistorian\.cfg/g" ${top_dir}/src/dnode/CMakeLists.txt - # src/dnode/CMakeLists.txt + # src/kit/taosdump/taosdump.c sed -i "s/Default is taosdata/Default is khroot/g" ${top_dir}/src/kit/taosdump/taosdump.c sed -i "s/\"taosdata\"/\"khroot\"/g" ${top_dir}/src/kit/taosdump/taosdump.c sed -i "s/TDengine/KingHistorian/g" ${top_dir}/src/kit/taosdump/taosdump.c @@ -372,6 +372,12 @@ if [[ "$dbName" == "kh" ]]; then sed -i "s/etc\/taos/etc\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c sed -i "s/lib\/taos/lib\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c sed -i "s/log\/taos/log\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c + # src/kit/shell/src/shellDarwin.c + sed -i "s/TDengine shell/KingHistorian shell/g" ${top_dir}/src/kit/shell/src/shellDarwin.c + sed -i "s/2020 by TAOS Data/2021 by Wellintech/g" ${top_dir}/src/kit/shell/src/shellDarwin.c + # src/kit/shell/src/shellLinux.c + sed -i "s/TDengine shell/KingHistorian shell/g" ${top_dir}/src/kit/shell/src/shellLinux.c + sed -i "s/2020 by TAOS Data/2021 by Wellintech/g" ${top_dir}/src/kit/shell/src/shellLinux.c # src/os/src/windows/wEnv.c sed -i "s/TDengine/KingHistorian/g" ${top_dir}/src/os/src/windows/wEnv.c # src/kit/shell/src/shellEngine.c diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c index a1413be1ce..e9cae70032 100644 --- a/src/kit/shell/src/shellDarwin.c +++ b/src/kit/shell/src/shellDarwin.c @@ -34,10 +34,10 @@ void insertChar(Command *cmd, char *c, int size); void printHelp() { char indent[10] = " "; - printf("taos shell is used to test the TDengine database\n"); + printf("taos shell is used to test the database\n"); printf("%s%s\n", indent, "-h"); - printf("%s%s%s\n", indent, indent, "TDengine server IP address to connect. The default host is localhost."); + printf("%s%s%s\n", indent, indent, "Server IP address to connect. The default host is localhost."); printf("%s%s\n", indent, "-p"); printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server."); printf("%s%s\n", indent, "-P"); diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c index 190df9c535..8d36e1cc6b 100644 --- a/src/kit/shell/src/shellLinux.c +++ b/src/kit/shell/src/shellLinux.c @@ -37,8 +37,8 @@ const char *argp_program_bug_address = ""; static char doc[] = ""; static char args_doc[] = ""; static struct argp_option options[] = { - {"host", 'h', "HOST", 0, "TDengine server FQDN to connect. The default host is localhost."}, - {"password", 'p', 0, 0, "The password to use when connecting to the server."}, + {"host", 'h', "HOST", 0, "Server FQDN to connect. The default host is localhost."}, + {"password", 'p', 0, 0, "The password to use when connecting to the server."}, {"port", 'P', "PORT", 0, "The TCP/IP port number to use for the connection."}, {"user", 'u', "USER", 0, "The user name to use when connecting to the server."}, {"auth", 'A', "Auth", 0, "The auth string to use when connecting to the server."}, diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c index c426653ab5..f693ae0b56 100644 --- a/src/kit/shell/src/shellWindows.c +++ b/src/kit/shell/src/shellWindows.c @@ -21,8 +21,26 @@ extern char configDir[]; +#ifdef _TD_POWER_ +char WINCLIENT_VERSION[] = "Welcome to the PowerDB shell from %s, Client Version:%s\n" + "Copyright (c) 2020 by PowerDB, Inc. All rights reserved.\n\n"; +#elif (_TD_TQ_ == true) +char WINCLIENT_VERSION[] = "Welcome to the TQ shell from %s, Client Version:%s\n" + "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n"; +#elif (_TD_PRO_ == true) +char WINCLIENT_VERSION[] = "Welcome to the ProDB shell from %s, Client Version:%s\n" + "Copyright (c) 2020 by Hanatech, Inc. All rights reserved.\n\n"; +#elif (_TD_KH_ == true) +char WINCLIENT_VERSION[] = "Welcome to the KingHistorian shell from %s, Client Version:%s\n" + "Copyright (c) 2021 by Wellintech, Inc. All rights reserved.\n\n"; +#elif (_TD_JH_ == true) +char WINCLIENT_VERSION[] = "Welcome to the jh_iot shell from %s, Client Version:%s\n" + "Copyright (c) 2021 by jinheng, Inc. All rights reserved.\n\n"; +#else char WINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n" "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n"; +#endif + void printVersion() { printf("version: %s\n", version); @@ -30,10 +48,10 @@ void printVersion() { void printHelp() { char indent[10] = " "; - printf("taos shell is used to test the TDengine database\n"); + printf("taos shell is used to test the database\n"); printf("%s%s\n", indent, "-h"); - printf("%s%s%s\n", indent, indent, "TDengine server FQDN to connect. The default host is localhost."); + printf("%s%s%s\n", indent, indent, "Server FQDN to connect. The default host is localhost."); printf("%s%s\n", indent, "-p"); printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server."); printf("%s%s\n", indent, "-P"); diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c index 920fdc8a12..3a0f3a7f61 100644 --- a/src/kit/taosdemo/taosdemo.c +++ b/src/kit/taosdemo/taosdemo.c @@ -773,7 +773,7 @@ static void printHelp() { printf("%s%s%s%s\n", indent, "-c, --config-dir=CONFIG_DIR", "\t", "Configuration directory."); printf("%s%s%s%s\n", indent, "-h, --host=HOST", "\t\t", - "TDengine server FQDN to connect. The default host is localhost."); + "Server FQDN to connect. The default host is localhost."); printf("%s%s%s%s\n", indent, "-P, --port=PORT", "\t\t", "The TCP/IP port number to use for the connection."); printf("%s%s%s%s\n", indent, "-I, --interface=INTERFACE", "\t", diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c index 798e7ef193..ff076522ca 100644 --- a/src/util/src/tconfig.c +++ b/src/util/src/tconfig.c @@ -467,7 +467,7 @@ bool taosReadGlobalCfg() { } void taosPrintGlobalCfg() { - uInfo(" taos config & system info:"); + uInfo(" config & system info:"); uInfo("=================================="); for (int i = 0; i < tsGlobalConfigNum; ++i) { @@ -553,7 +553,7 @@ static void taosDumpCfg(SGlobalCfg *cfg) { } void taosDumpGlobalCfg() { - printf("taos global config:\n"); + printf(" global config:\n"); printf("==================================\n"); for (int i = 0; i < tsGlobalConfigNum; ++i) { SGlobalCfg *cfg = tsGlobalConfig + i; @@ -564,7 +564,7 @@ void taosDumpGlobalCfg() { taosDumpCfg(cfg); } - printf("\ntaos local config:\n"); + printf("\n local config:\n"); printf("==================================\n"); for (int i = 0; i < tsGlobalConfigNum; ++i) { -- GitLab