refactor: use _comp_compgen_filedir

Author: akinomyoga

bash_completion

@@ -1012,7 +1012,7 @@ _comp_variable_assignments()
     case $prev in
         TZ)
             cur=/usr/share/zoneinfo/$cur
-            _filedir
+            _comp_compgen -a filedir
             if ((${#COMPREPLY[@]})); then
                 for i in "${!COMPREPLY[@]}"; do
                     if [[ ${COMPREPLY[i]} == *.tab ]]; then
@@ -1037,7 +1037,7 @@ _comp_variable_assignments()
             ;;
         *)
             _variables && return 0
-            _filedir
+            _comp_compgen -a filedir
             ;;
     esac
 
@@ -1052,9 +1052,12 @@ _comp_variable_assignments()
 #
 # Options:
 #     -n EXCLUDE  Passed to _comp_get_words -n with redirection chars
-#     -e XSPEC    Passed to _filedir as first arg for stderr redirections
-#     -o XSPEC    Passed to _filedir as first arg for other output redirections
-#     -i XSPEC    Passed to _filedir as first arg for stdin redirections
+#     -e XSPEC    Passed to _comp_compgen_filedir as first arg for stderr
+#                 redirections
+#     -o XSPEC    Passed to _comp_compgen_filedir as first arg for other output
+#                 redirections
+#     -i XSPEC    Passed to _comp_compgen_filedir as first arg for stdin
+#                 redirections
 #     -s          Split long options with _comp__split_longopt, implies -n =
 # @param $1...$3 args Original arguments specified to the completion function.
 #                     The first argument $1 is command name.  The second
@@ -1065,9 +1068,9 @@ _comp_variable_assignments()
 # @var[out] prev          Reconstructed previous word
 # @var[out] words         Reconstructed words
 # @var[out] cword         Current word index in `words`
-# @var[out] comp_args     Original arguments specified to the completion function
-#                         are saved in this array, if the arguments $1...$3 is
-#                         specified.
+# @var[out] comp_args     Original arguments specified to the completion
+#                         function are saved in this array, if the arguments
+#                         $1...$3 is specified.
 # @var[out,opt] was_split When "-s" is specified, `"set"/""` is set depending
 #                         on whether the split happened.
 # @return  True (0) if completion needs further processing,
@@ -1123,7 +1126,7 @@ _comp_initialize()
                 ;;
         esac
         cur=${cur##"$redir"}
-        _filedir "$xspec"
+        _comp_compgen -a filedir "$xspec"
         return 1
     fi
 
@@ -2469,23 +2472,23 @@ _comp_longopt()
             return
             ;;
         --!(no-*)dir*)
-            _filedir -d
+            _comp_compgen -a filedir -d
             return
             ;;
         --!(no-*)@(file|path)*)
-            _filedir
+            _comp_compgen -a filedir
             return
             ;;
         --+([-a-z0-9_]))
             local argtype=$(LC_ALL=C $1 --help 2>&1 | command sed -ne \
                 "s|.*$prev\[\{0,1\}=[<[]\{0,1\}\([-A-Za-z0-9_]\{1,\}\).*|\1|p")
             case ${argtype,,} in
                 *dir*)
-                    _filedir -d
+                    _comp_compgen -a filedir -d
                     return
                     ;;
                 *file* | *path*)
-                    _filedir
+                    _comp_compgen -a filedir
                     return
                     ;;
             esac
@@ -2502,10 +2505,10 @@ _comp_longopt()
             done)"
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $1 == *@(rmdir|chroot) ]]; then
-        _filedir -d
+        _comp_compgen -a filedir -d
     else
         [[ $1 == *mkdir ]] && compopt -o nospace
-        _filedir
+        _comp_compgen -a filedir
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.

completions/2to3

@@ -19,7 +19,7 @@ _comp_cmd_2to3()
             return
             ;;
         -o | --output-dir)
-            _filedir -d
+            _comp_compgen -a filedir -d
             return
             ;;
     esac
@@ -32,7 +32,7 @@ _comp_cmd_2to3()
         return
     fi
 
-    _filedir py
+    _comp_compgen -a filedir py
 } &&
     complete -F _comp_cmd_2to3 2to3
 

completions/7z

@@ -109,8 +109,8 @@ _comp_cmd_7z()
         #   - terminate on token containing anything [^a-z0-9]
         #     (assumption: extensions are all lowercase)
         [[ $mode == w ]] &&
-            _filedir '@(7z|bz2|swf|?(g)tar|?(t)[bglx]z|tb?(z)2|wim)' ||
-            _filedir '@(7z?(.001)|arj|bz2|cab|cb7|chm|cpio|deb|dmg|flv|gem|img|iso|lz[ah]|lzma?(86)|msi|pmd|[rx]ar|rpm|sw[fm]|?(g)tar|taz|?(t)[bglx]z|tb?(z)2|vhd|wim|Z)'
+            _comp_compgen -a filedir '@(7z|bz2|swf|?(g)tar|?(t)[bglx]z|tb?(z)2|wim)' ||
+            _comp_compgen -a filedir '@(7z?(.001)|arj|bz2|cab|cb7|chm|cpio|deb|dmg|flv|gem|img|iso|lz[ah]|lzma?(86)|msi|pmd|[rx]ar|rpm|sw[fm]|?(g)tar|taz|?(t)[bglx]z|tb?(z)2|vhd|wim|Z)'
     else
         if [[ ${words[1]} == d ]]; then
             local IFS=$'\n'
@@ -119,7 +119,7 @@ _comp_cmd_7z()
                 2>/dev/null | tail -n+2)")" -- "$cur"))
             compopt -o filenames
         else
-            _filedir
+            _comp_compgen -a filedir
         fi
     fi
 } &&

completions/_adb

@@ -20,7 +20,7 @@ _comp_cmd_adb()
             return
             ;;
         -f)
-            _filedir
+            _comp_compgen -a filedir
             return
             ;;
     esac
@@ -54,7 +54,7 @@ _comp_cmd_adb()
 
     case $cmd in
         push | restore | sideload)
-            _filedir
+            _comp_compgen -a filedir
             ;;
         forward)
             COMPREPLY=($(compgen -W \

completions/_chsh

@@ -22,7 +22,7 @@ _comp_cmd_chsh()
             return
             ;;
         -R | --root)
-            _filedir -d
+            _comp_compgen -a filedir -d
             return
             ;;
         -s | --shell)

completions/_hexdump

@@ -13,7 +13,7 @@ _comp_cmd_hexdump()
             return
             ;;
         -f)
-            _filedir
+            _comp_compgen -a filedir
             return
             ;;
     esac
@@ -25,7 +25,7 @@ _comp_cmd_hexdump()
         return
     fi
 
-    _filedir
+    _comp_compgen -a filedir
 } &&
     complete -F _comp_cmd_hexdump hexdump hd
 

completions/_hwclock

@@ -13,7 +13,7 @@ _comp_cmd_hwclock()
             return
             ;;
         -f | --rtc | --adjfile)
-            _filedir
+            _comp_compgen -a filedir
             return
             ;;
     esac

completions/_mock

@@ -32,11 +32,11 @@ _comp_cmd_mock()
             return
             ;;
         --configdir | --resultdir)
-            _filedir -d
+            _comp_compgen -a filedir -d
             return
             ;;
         --spec)
-            _filedir spec
+            _comp_compgen -a filedir spec
             return
             ;;
         --target)
@@ -61,7 +61,7 @@ _comp_cmd_mock()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        _filedir '@(?(no)src.r|s)pm'
+        _comp_compgen -a filedir '@(?(no)src.r|s)pm'
     fi
 } &&
     complete -F _comp_cmd_mock mock

completions/_mount.linux

@@ -28,7 +28,7 @@ _comp_cmd_mount()
             return
             ;;
         --bind | -B | --rbind | -R)
-            _filedir -d
+            _comp_compgen -a filedir -d
             return
             ;;
         -p | --pass-fd)
@@ -245,7 +245,7 @@ _comp_cmd_mount()
         fi
     fi
 
-    _filedir
+    _comp_compgen -a filedir
 } &&
     complete -F _comp_cmd_mount mount
 

completions/_repomanage

@@ -16,7 +16,7 @@ _comp_cmd_repomanage()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        _filedir -d
+        _comp_compgen -a filedir -d
     fi
 } &&
     complete -F _comp_cmd_repomanage repomanage