diff options
| author | Paul Buetow <paul@buetow.org> | 2024-09-03 10:58:34 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-09-03 10:58:34 +0300 |
| commit | 1ade563588a8de2dfa9356e2c0e2ce33a3861227 (patch) | |
| tree | e6c6eb61576fb07d62404c47e73a39f417fc401a /internal/config/client/client.go | |
| parent | 3e33b52642b2b4d5a0c7a8d3a7a6bb269553be1f (diff) | |
initial generic handling of environment variables
Diffstat (limited to 'internal/config/client/client.go')
| -rw-r--r-- | internal/config/client/client.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/config/client/client.go b/internal/config/client/client.go index d6f2939..ada1a76 100644 --- a/internal/config/client/client.go +++ b/internal/config/client/client.go @@ -26,16 +26,16 @@ func New(configFile string) (ClientConfig, error) { log.Println("Skipping config file:", err) } - conf.Servers = config.EnvToStrSlice("GOS_SERVERS", conf.Servers) - conf.APIKey = config.EnvToStr("GOS_API_KEY", conf.APIKey) - conf.Editor = config.EnvToStr("GOS_EDITOR", "EDITOR", conf.Editor, "vi") + conf.Servers = config.Env[config.ToStringSlice]("GOS_SERVERS", conf.Servers) + conf.APIKey = config.Env[config.ToString]("GOS_API_KEY", conf.APIKey) + conf.Editor = config.Env[config.ToString]("GOS_EDITOR", "EDITOR", conf.Editor, "vi") defaultDataDir := fmt.Sprintf("%s/.gos/data", os.Getenv("HOME")) - conf.DataDir = config.EnvToStr("GOS_DATA_DIR", conf.DataDir, defaultDataDir) - conf.ComposeFile = config.EnvToStr("GOS_COMPOSE_FILE", conf.ComposeFile, "compose.txt") + conf.DataDir = config.Env[config.ToString]("GOS_DATA_DIR", conf.DataDir, defaultDataDir) + conf.ComposeFile = config.Env[config.ToString]("GOS_COMPOSE_FILE", conf.ComposeFile, "compose.txt") defaultLogFile := fmt.Sprintf("%s/.gos/gos.log", os.Getenv("HOME")) - conf.LogFile = config.EnvToStr("GOS_LOG_FILE", conf.LogFile, defaultLogFile) + conf.LogFile = config.Env[config.ToString]("GOS_LOG_FILE", conf.LogFile, defaultLogFile) return conf, nil } |