Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 12 additions & 20 deletions internal/flag_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,33 +64,25 @@ Flags:`)
fs.PrintDefaults()
}

// -? is not a valid pflag name; strip it before fs.Parse so other flags
// (like -D) are still parsed and returned alongside ErrHelp.
helpQuestion := false
// Strip all help tokens (-h, --help, -?) before fs.Parse so that pflag
// does not short-circuit and skip flags that appear after the help flag
// (e.g. "--help -D /path" must still parse -D).
helpRequested := false
filtered := make([]string, 0, len(osArgs))
for _, a := range osArgs {
if a == "-?" {
helpQuestion = true
break
switch a {
case "-h", "--help", "-?":
helpRequested = true
default:
filtered = append(filtered, a)
}
}
if helpQuestion {
filtered := make([]string, 0, len(osArgs))
for _, a := range osArgs {
if a != "-?" {
filtered = append(filtered, a)
}
}
osArgs = filtered
}

if err := fs.Parse(osArgs); err != nil {
if errors.Is(err, pflag.ErrHelp) {
return OpsFlags{Directory: *dir, DryRun: *dryRun, List: *list, Silent: *silent, Version: *ver}, nil, ErrHelp
}
if err := fs.Parse(filtered); err != nil {
return OpsFlags{}, nil, err
}

if helpQuestion {
if helpRequested {
fs.Usage()
return OpsFlags{Directory: *dir, DryRun: *dryRun, List: *list, Silent: *silent, Version: *ver}, nil, ErrHelp
}
Expand Down
18 changes: 18 additions & 0 deletions internal/flag_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,24 @@ func TestParseOpsFlags(t *testing.T) {
wantFlags: OpsFlags{Directory: "/some/path"},
wantErr: ErrHelp,
},
{
name: "--help before -D preserves Directory",
input: []string{"--help", "-D", "/some/path"},
wantFlags: OpsFlags{Directory: "/some/path"},
wantErr: ErrHelp,
},
{
name: "-h before -D preserves Directory",
input: []string{"-h", "-D", "/some/path"},
wantFlags: OpsFlags{Directory: "/some/path"},
wantErr: ErrHelp,
},
{
name: "-? before -D preserves Directory",
input: []string{"-?", "-D", "/some/path"},
wantFlags: OpsFlags{Directory: "/some/path"},
wantErr: ErrHelp,
},
{
name: "-D with empty string value",
input: []string{"-D", "", "prod", "cmd"},
Expand Down