@@ -44,6 +44,8 @@ through a simple CLI interface.`,
44
44
45
45
globalConfig = config
46
46
47
+ // Prioritize environment variables over config file
48
+ // env > flags > config
47
49
if ! cmd .Flag ("server" ).Changed && config .ServerUrl != "" {
48
50
serverURL = config .ServerUrl
49
51
}
@@ -71,6 +73,7 @@ func configPath() (string, error) {
71
73
return "" , err
72
74
}
73
75
dir := filepath .Join (home , ".config" , "opentaco" )
76
+
74
77
if err := os .MkdirAll (dir , 0o755 ); err != nil {
75
78
return "" , err
76
79
}
@@ -172,7 +175,7 @@ func runSetupWizard() (*Config, error) {
172
175
173
176
for {
174
177
175
- fmt .Print ("Enter OpenTaco server url [http://localhost:8080]:" )
178
+ fmt .Print ("Enter OpenTaco server url [http://localhost:8080]: " )
176
179
serverURL , err := reader .ReadString ('\n' )
177
180
if err != nil {
178
181
return nil , err
@@ -213,26 +216,6 @@ func runSetupWizard() (*Config, error) {
213
216
214
217
}
215
218
216
-
217
- func getConfigurationValue (flagValue , configValue , envKey , defaultValue string ) string {
218
- if envValue := os .Getenv (envKey ); envValue != "" {
219
- return envValue
220
- }
221
- if flagValue != "" {
222
- return flagValue
223
-
224
- }
225
-
226
- if configValue != "" {
227
- return configValue
228
- }
229
-
230
- return defaultValue
231
-
232
- }
233
-
234
-
235
-
236
219
// getEnvOrDefault gets an environment variable or returns a default value
237
220
func getEnvOrDefault (key , defaultValue string ) string {
238
221
if value := os .Getenv (key ); value != "" {
0 commit comments