diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c index b3e5015706..e5c37e3d55 100644 --- a/source/dnode/mgmt/exe/dmMain.c +++ b/source/dnode/mgmt/exe/dmMain.c @@ -125,7 +125,7 @@ void dmLogCrash(int signum, void *sigInfo, void *context) { _return: - taosLogCrashInfo("taosd", pMsg, msgLen, signum, sigInfo); + taosLogCrashInfo(CUS_PROMPT "d", pMsg, msgLen, signum, sigInfo); #ifdef _TD_DARWIN_64 exit(signum); @@ -258,7 +258,7 @@ static void dmPrintArgs(int32_t argc, char const *argv[]) { static void dmGenerateGrant() { mndGenerateMachineCode(); } static void dmPrintVersion() { - printf("%s\ntaosd version: %s compatible_version: %s\n", TD_PRODUCT_NAME, version, compatible_version); + printf("%s\n%sd version: %s compatible_version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, version, compatible_version); printf("git: %s\n", gitinfo); #ifdef TD_ENTERPRISE printf("gitOfInternal: %s\n", gitinfoOfInternal); @@ -268,7 +268,7 @@ static void dmPrintVersion() { static void dmPrintHelp() { char indent[] = " "; - printf("Usage: taosd [OPTION...] \n\n"); + printf("Usage: %sd [OPTION...] \n\n", CUS_PROMPT); printf("%s%s%s%s\n", indent, "-a,", indent, DM_APOLLO_URL); printf("%s%s%s%s\n", indent, "-c,", indent, DM_CFG_DIR); printf("%s%s%s%s\n", indent, "-s,", indent, DM_SDB_INFO); diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c index 67a2cd97c4..92e5967416 100644 --- a/source/os/src/osSysinfo.c +++ b/source/os/src/osSysinfo.c @@ -19,6 +19,10 @@ #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" +#else +#ifndef CUS_PROMPT +#define CUS_PROMPT "taos" +#endif #endif #define PROCESS_ITEM 12 @@ -987,7 +991,7 @@ void taosKillSystem() { exit(0); #else // SIGINT - (void)printf("taosd will shut down soon"); + (void)printf("%sd will shut down soon", CUS_PROMPT); (void)kill(tsProcId, 2); #endif } diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c index 1eb61d2394..4638f2ad74 100644 --- a/tools/shell/src/shellArguments.c +++ b/tools/shell/src/shellArguments.c @@ -22,6 +22,10 @@ #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" +#else +#ifndef CUS_PROMPT +#define CUS_PROMPT "taos" +#endif #endif #define TAOS_CONSOLE_PROMPT_CONTINUE " -> " @@ -57,7 +61,7 @@ static int32_t shellParseSingleOpt(int32_t key, char *arg); void shellPrintHelp() { char indent[] = " "; - printf("Usage: taos [OPTION...] \r\n\r\n"); + printf("Usage: %s [OPTION...] \r\n\r\n", CUS_PROMPT); printf("%s%s%s%s\r\n", indent, "-a,", indent, SHELL_AUTH); printf("%s%s%s%s\r\n", indent, "-A,", indent, SHELL_GEN_AUTH); printf("%s%s%s%s\r\n", indent, "-B,", indent, SHELL_BI_MODE); @@ -435,11 +439,11 @@ int32_t shellParseArgs(int32_t argc, char *argv[]) { shell.info.promptSize = strlen(shell.info.promptHeader); #ifdef TD_ENTERPRISE snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), - "%s\ntaos version: %s compatible_version: %s\ngit: %s\ngitOfInternal: %s\nbuild: %s", TD_PRODUCT_NAME, - version, compatible_version, gitinfo, gitinfoOfInternal, buildinfo); + "%s\n%s version: %s compatible_version: %s\ngit: %s\ngitOfInternal: %s\nbuild: %s", TD_PRODUCT_NAME, + CUS_PROMPT, version, compatible_version, gitinfo, gitinfoOfInternal, buildinfo); #else snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), - "%s\ntaos version: %s compatible_version: %s\ngit: %s\nbuild: %s", TD_PRODUCT_NAME, version, + "%s\n%s version: %s compatible_version: %s\ngit: %s\nbuild: %s", TD_PRODUCT_NAME, CUS_PROMPT, version, compatible_version, gitinfo, buildinfo); #endif