Skip to content

improve(config): Use XDG Base Directory for config and log paths when environment variables are available #113

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

Open
gonsalvesc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improve(config): Use XDG Base Directory for config and log paths when environment variables are available #113

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,16 @@ func main() {
os.Exit(1)
}
sshConfigFile := filepath.Join(home, ".ssh", "config")

metaDataFile := filepath.Join(home, ".lazyssh", "metadata.json")
if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
configDir := filepath.Join(xdgConfig, "lazyssh")
if err := os.MkdirAll(configDir, 0o750); err != nil {
log.Errorw("failed to create XDG config directory", "error", err)
os.Exit(1)
}
metaDataFile = filepath.Join(configDir, "metadata.json")
}

serverRepo := ssh_config_file.NewRepository(log, sshConfigFile, metaDataFile)
serverService := services.NewServerService(log, serverRepo)
Expand Down
15 changes: 11 additions & 4 deletions internal/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,18 @@ func New(service string, outputPaths ...string) (*zap.SugaredLogger, error) {
"service": service,
}

home, err := os.UserHomeDir()
if err != nil {
return nil, err
var logDir string

if stateDir := os.Getenv("XDG_STATE_HOME"); stateDir != "" {
logDir = filepath.Join(stateDir, "lazyssh")
} else {
home, err := os.UserHomeDir()
if err != nil {
return nil, err
}
logDir = filepath.Join(home, ".lazyssh")
}
logDir := filepath.Join(home, ".lazyssh")

if err := os.MkdirAll(logDir, 0o750); err != nil {
return nil, err
}
Expand Down
Loading