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: TIUP_HOME is not loaded on initializes meta #1885

Merged
merged 3 commits into from
May 23, 2022
Merged

fix: TIUP_HOME is not loaded on initializes meta #1885

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
267090e
fix
srstack May 16, 2022
5173c55
if -> switch
srstack May 16, 2022
708e2a1
Merge branch 'master' into fix---TIUP_HOME-is-not-loaded-on-initializ…
AstroProfundis May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkg/cluster/spec/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,19 @@ var initialized = false
// The directory will be created before return if it does not already exist.
func Initialize(base string) error {
tiupData := os.Getenv(tiuplocaldata.EnvNameComponentDataDir)
if tiupData == "" {
tiupHome := os.Getenv(tiuplocaldata.EnvNameHome)

switch {
case tiupData != "":
profileDir = tiupData
case tiupHome != "":
profileDir = path.Join(tiupHome, tiuplocaldata.StorageParentDir, base)
default:
homeDir, err := getHomeDir()
if err != nil {
return errors.Trace(err)
}
profileDir = path.Join(homeDir, ".tiup", tiuplocaldata.StorageParentDir, base)
} else {
profileDir = tiupData
}

clusterBaseDir := filepath.Join(profileDir, TiUPClusterDir)
Expand Down