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

Prevent creating ~/.octosql dir if XDG dirs exists #316

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Prevent creating ~/.octosql dir if XDG dirs exists #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ var octosqlHomeDir = func() string {
}
}
return octosqlHomeDir
}()
}

var OctosqlConfigDir = func() string {
configDirPath, err := xdg.SearchConfigFile(ApplicationName)
if err != nil {
return octosqlHomeDir
return octosqlHomeDir()
}
return configDirPath
}()

var OctosqlCacheDir = func() string {
cacheDirPath, err := xdg.SearchCacheFile(ApplicationName)
if err != nil {
return octosqlHomeDir
return octosqlHomeDir()
}
return cacheDirPath
}()

var OctosqlDataDir = func() string {
dataDirPath, err := xdg.SearchDataFile(ApplicationName)
if err != nil {
return octosqlHomeDir
return octosqlHomeDir()
}
return dataDirPath
}()
Expand Down