diff options
| author | Paul Buetow <paul@buetow.org> | 2024-08-11 22:18:49 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-08-11 22:18:49 +0300 |
| commit | ad8ed5130c18a265e58c5d99d659206196260182 (patch) | |
| tree | 1a37173c5ee5baacc917bd6ead8f4f40605a7554 /internal/config/client | |
| parent | 94ceede429dc807b54ceab0f27d74b98c94dc5ac (diff) | |
add CBs for config defaults
Diffstat (limited to 'internal/config/client')
| -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 8676114..00819c0 100644 --- a/internal/config/client/client.go +++ b/internal/config/client/client.go @@ -21,16 +21,16 @@ type ClientConfig struct { func New(configFile string) (ClientConfig, error) { conf, _ := config.FromFile[ClientConfig](configFile) - conf.Server = config.FromENV("GOS_SERVERS", conf.Server) - conf.APIKey = config.FromENV("GOS_API_KEY", conf.APIKey) - conf.Editor = config.FromENV("GOS_EDITOR", "EDITOR", conf.Editor, "vi") + conf.Server = config.EnvToStr("GOS_SERVERS", conf.Server) + conf.APIKey = config.EnvToStr("GOS_API_KEY", conf.APIKey) + conf.Editor = config.EnvToStr("GOS_EDITOR", "EDITOR", conf.Editor, "vi") defaultDataDir := fmt.Sprintf("%s/.gos/data", os.Getenv("HOME")) - conf.DataDir = config.FromENV("GOS_DATA_DIR", conf.DataDir, defaultDataDir) - conf.ComposeFile = config.FromENV("GOS_COMPOSE_FILE", conf.ComposeFile, "compose.txt") + conf.DataDir = config.EnvToStr("GOS_DATA_DIR", conf.DataDir, defaultDataDir) + conf.ComposeFile = config.EnvToStr("GOS_COMPOSE_FILE", conf.ComposeFile, "compose.txt") defaultLogFile := fmt.Sprintf("%s/.gos/gos.log", os.Getenv("HOME")) - conf.LogFile = config.FromENV("GOS_LOG_FILE", conf.LogFile, defaultLogFile) + conf.LogFile = config.EnvToStr("GOS_LOG_FILE", conf.LogFile, defaultLogFile) return conf, nil } |