Skip to content

Commit 5a109fa

Browse files
committed
Minor changes to \? variables listing
1 parent 054219f commit 5a109fa

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

env/types.go

+18-5
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ var envVarNames = []varName{
174174
},
175175
{
176176
text.CommandUpper() + "_SSLMODE, SSLMODE",
177-
"when set to 'retry', allows postgres connections to attempt to reconnect when no ?sslmode= was specified on the url",
177+
"when set to 'retry', allows connections to attempt to reconnect when no ?sslmode= was specified on the url",
178178
},
179179
{
180180
"SYNTAX_HL",
@@ -635,13 +635,26 @@ func Listing(w io.Writer) {
635635
for i, v := range pvarNames {
636636
pvarsWithDesc[i] = v.String()
637637
}
638-
envVarsWithDesc := make([]string, len(envVarNames))
639-
for i, v := range envVarNames {
640-
envVarsWithDesc[i] = v.String()
641-
}
642638

643639
// determine config dir name
644640
configDir, configExtra := buildConfigDir("config.yaml")
641+
642+
// environment var names
643+
configDesc := configDir
644+
if configExtra != "" {
645+
configDesc = configExtra
646+
}
647+
ev := []varName{
648+
{
649+
text.CommandUpper() + "_CONFIG",
650+
fmt.Sprintf(`config file path (default %q)`, configDesc),
651+
},
652+
}
653+
envVarsWithDesc := make([]string, len(envVarNames)+1)
654+
for i, v := range append(ev, envVarNames...) {
655+
envVarsWithDesc[i] = v.String()
656+
}
657+
645658
if configExtra != "" {
646659
configExtra = " (" + configExtra + ")"
647660
}

0 commit comments

Comments
 (0)