Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: tglobal cus prompt support for windows #20845

Merged
merged 27 commits into from Apr 10, 2023
Merged

fix: tglobal cus prompt support for windows #20845

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6e72ced
chore: refactor cus prompt
sangshuduo Mar 29, 2023
b318bc1
fix: client name in install.sh
sangshuduo Mar 29, 2023
e4d26be
fix: -Wno-reserved-user-defined-literal
tomchon Mar 29, 2023
2453da9
fix: update taos-tools commit
sangshuduo Mar 30, 2023
e5a5ab9
fix: include/os/osDir.h
sangshuduo Mar 30, 2023
cfb9bf1
Merge branch 'chore/sangshuduo/TD-19391-oem-support' of github.com:ta…
sangshuduo Mar 30, 2023
be7e1ec
fix: check cus name
sangshuduo Mar 30, 2023
651ce44
fix: makepkg.sh
sangshuduo Mar 30, 2023
c8ba357
chore: update taos-tools d194dc9
sangshuduo Mar 30, 2023
6f85e23
Merge branch '3.0' into chore/sangshuduo/TD-19391-oem-support
sangshuduo Mar 30, 2023
bafc710
fix: cus name
sangshuduo Mar 30, 2023
73dd574
fix: change adapter prefix
sangshuduo Mar 30, 2023
a998088
fix: tools/*.sh
sangshuduo Mar 30, 2023
cfb8fa4
fix: scripts
sangshuduo Mar 31, 2023
2108cde
fix: ../../packaging/tools/install_client.sh
sangshuduo Apr 1, 2023
c703ff0
chore: cus domain in script
sangshuduo Apr 1, 2023
6890d53
fix: cus name in packaging/tools/install.sh
sangshuduo Apr 3, 2023
e0aafbf
fix: cus name in ../../packaging/tools/remove.sh
sangshuduo Apr 3, 2023
9b81813
fix: don't edit origin file
sangshuduo Apr 3, 2023
58b377d
chore: merge with 3.0
sangshuduo Apr 4, 2023
be3e875
fix: remove brand name
sangshuduo Apr 4, 2023
58f9d97
fix: update taos-tools
sangshuduo Apr 4, 2023
c9dede3
fix: cus name in log
sangshuduo Apr 4, 2023
ef88794
Merge branch '3.0' into chore/sangshuduo/TD-19391-oem-support
sangshuduo Apr 4, 2023
5528bb6
fix: compile error without cuc name
sangshuduo Apr 4, 2023
ca5e17f
chore: merge with 3.0
sangshuduo Apr 10, 2023
35377ab
fix: source/common/src/tglobal.c
sangshuduo Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/common/src/tglobal.c
View file
Open in desktop
Expand Up @@ -229,7 +229,7 @@ static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *input
taosExpandDir(inputCfgDir, cfgDir, PATH_MAX);
if (taosIsDir(cfgDir)) {
#ifdef CUS_PROMPT
snprintf(cfgFile, sizeof(cfgFile), "%s" TD_DIRSEP "%s.cfg", CUS_PROMPT, cfgDir);
snprintf(cfgFile, sizeof(cfgFile), "%s" TD_DIRSEP "%s.cfg", cfgDir, CUS_PROMPT);
#else
snprintf(cfgFile, sizeof(cfgFile), "%s" TD_DIRSEP "taos.cfg", cfgDir);
#endif
Expand Down