refactor(_comp_compgen_commands): simplify -o filenames handling

scop · akinomyoga · scop · commit c8b9830b86e5 · 2023-06-01T21:37:31.000+03:00
Co-authored-by: Koichi Murase &lt;myoga.murase@gmail.com&gt;
diff --git a/bash_completion b/bash_completion
@@ -2707,9 +2707,8 @@ _complete_as_root()
 _comp_compgen_commands()
 {
     [[ ! ${cur-} ]] && shopt -q no_empty_cmd_completion && return
-    _comp_compgen -- -c -o plusdirs
-    # for e.g. spaces in paths to and in command names
-    ((${#COMPREPLY[@]} == 0)) || compopt -o filenames
+    # -o filenames for e.g. spaces in paths to and in command names
+    _comp_compgen -- -c -o plusdirs && compopt -o filenames
 }
 
 # @since 2.12

Original file line number	Diff line number	Diff line change
`@@ -2707,9 +2707,8 @@ _complete_as_root()`
`2707`	`2707`	`_comp_compgen_commands()`
`2708`	`2708`	`{`
`2709`	`2709`	`[[ ! ${cur-} ]] && shopt -q no_empty_cmd_completion && return`
`2710`		`- _comp_compgen -- -c -o plusdirs`
`2711`		`- # for e.g. spaces in paths to and in command names`
`2712`		`- ((${#COMPREPLY[@]} == 0)) \|\| compopt -o filenames`
	`2710`	`+ # -o filenames for e.g. spaces in paths to and in command names`
	`2711`	`+ _comp_compgen -- -c -o plusdirs && compopt -o filenames`
`2713`	`2712`	`}`
`2714`	`2713`
`2715`	`2714`	`# @since 2.12`