refactor: use _comp_compgen -c for filedir

akinomyoga · akinomyoga · commit 4a4851c2dd33 · 2023-05-06T03:52:06.000+09:00
diff --git a/completions/_udevadm b/completions/_udevadm
@@ -34,8 +34,7 @@ _comp_cmd_udevadm()
             return
             ;;
         --name)
-            : "${cur:=/dev/}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur:-/dev/}" filedir
             return
             ;;
         --device-id-of-file | --exit-if-exists)
diff --git a/completions/badblocks b/completions/badblocks
@@ -21,8 +21,7 @@ _comp_cmd_badblocks()
         return
     fi
 
-    : "${cur:=/dev/}"
-    _comp_compgen filedir
+    _comp_compgen -c "${cur:-/dev/}" filedir
 } &&
     complete -F _comp_cmd_badblocks badblocks
 
diff --git a/completions/cryptsetup b/completions/cryptsetup
@@ -7,8 +7,7 @@ _comp_cmd_cryptsetup__name()
 
 _comp_cmd_cryptsetup__device()
 {
-    : "${cur:=/dev/}"
-    _comp_compgen filedir
+    _comp_compgen -c "${cur:-/dev/}" filedir
 }
 
 _comp_cmd_cryptsetup()
diff --git a/completions/curl b/completions/curl
@@ -53,8 +53,7 @@ _comp_cmd_curl()
         --data | --data-ascii | --data-binary | --data-urlencode | --header | \
             --proxy-header | -${noargopts}[dH])
             if [[ $cur == \@* ]]; then
-                cur=${cur:1}
-                _comp_compgen filedir
+                _comp_compgen -c "${cur:1}" filedir
                 if [[ ${#COMPREPLY[@]} -eq 1 && -d ${COMPREPLY[0]} ]]; then
                     COMPREPLY[0]+=/
                     compopt -o nospace
diff --git a/completions/dd b/completions/dd
@@ -7,8 +7,7 @@ _comp_cmd_dd()
 
     case $cur in
         if=* | of=*)
-            cur=${cur#*=}
-            _comp_compgen filedir
+            _comp_compgen -c "${cur#*=}" filedir
             return
             ;;
         conv=*)
diff --git a/completions/dnssec-keygen b/completions/dnssec-keygen
@@ -27,8 +27,7 @@ _comp_cmd_dnssec_keygen()
             return
             ;;
         -r)
-            : "${cur:=/dev/}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur:-/dev/}" filedir
             return
             ;;
         -v)
diff --git a/completions/dot b/completions/dot
@@ -26,10 +26,8 @@ _comp_cmd_dot()
             return
             ;;
         -o*)
-            cur=${cur#-o}
-            _comp_compgen filedir
-            ((${#COMPREPLY[@]})) &&
-                COMPREPLY=($(compgen -P -o -W '"${COMPREPLY[@]}"' -- "$cur"))
+            _comp_compgen -c "${cur#-o}" filedir
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/-o}")
             return
             ;;
     esac
diff --git a/completions/dumpe2fs b/completions/dumpe2fs
@@ -20,8 +20,7 @@ _comp_cmd_dumpe2fs()
         return
     fi
 
-    : "${cur:=/dev/}"
-    _comp_compgen filedir
+    _comp_compgen -c "${cur:-/dev/}" filedir
 } &&
     complete -F _comp_cmd_dumpe2fs dumpe2fs
 
diff --git a/completions/e2freefrag b/completions/e2freefrag
@@ -16,8 +16,7 @@ _comp_cmd_e2freefrag()
         return
     fi
 
-    : "${cur:=/dev/}"
-    _comp_compgen filedir
+    _comp_compgen -c "${cur:-/dev/}" filedir
 } &&
     complete -F _comp_cmd_e2freefrag e2freefrag
 
diff --git a/completions/e2label b/completions/e2label
@@ -6,8 +6,7 @@ _comp_cmd_e2label()
     _comp_initialize -- "$@" || return
 
     if ((cword == 1)); then
-        : "${cur:=/dev/}"
-        _comp_compgen filedir
+        _comp_compgen -c "${cur:-/dev/}" filedir
     fi
 } &&
     complete -F _comp_cmd_e2label e2label
diff --git a/completions/export b/completions/export
@@ -38,13 +38,11 @@ _comp_cmd_export()
             if [[ $pval != \'\' ]]; then
                 COMPREPLY=("$pval")
             else
-                cur=${cur#*=}
-                _comp_compgen filedir
+                _comp_compgen -c "${cur#*=}" filedir
             fi
             ;;
         *=*)
-            cur=${cur#*=}
-            _comp_compgen filedir
+            _comp_compgen -c "${cur#*=}" filedir
             ;;
         *)
             if [[ $cword -eq 1 && $cur == -* ]]; then
diff --git a/completions/gprof b/completions/gprof
@@ -10,9 +10,8 @@ _comp_cmd_gprof()
             return
             ;;
         -S*)
-            cur=${cur:2}
-            _comp_compgen filedir
-            COMPREPLY=("${COMPREPLY[@]/#/-S}")
+            _comp_compgen -c "${cur:2}" filedir
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/-S}")
             return
             ;;
         -O*)
diff --git a/completions/growisofs b/completions/growisofs
@@ -17,8 +17,7 @@ _comp_cmd_growisofs()
         /?(r)dev/*)
             if [[ $cur == =* ]]; then
                 # e.g. /dev/dvd=foo.iso, /dev/dvdrw=/dev/zero
-                cur="${cur#=}"
-                _comp_compgen filedir
+                _comp_compgen -c "${cur#=}" filedir
                 return
             fi
             ;;
diff --git a/completions/hddtemp b/completions/hddtemp
@@ -31,8 +31,7 @@ _comp_cmd_hddtemp()
         COMPREPLY=($(compgen -W '$(_parse_help "$1") --help' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        : "${cur:=/dev/}"
-        _comp_compgen filedir
+        _comp_compgen -c "${cur:-/dev/}" filedir
     fi
 } &&
     complete -F _comp_cmd_hddtemp hddtemp
diff --git a/completions/java b/completions/java
@@ -3,8 +3,7 @@
 # available path elements completion
 _comp_cmd_java__classpath()
 {
-    cur=${cur##*:}
-    _comp_compgen filedir '@(jar|zip)'
+    _comp_compgen -c "${cur##*:}" filedir '@(jar|zip)'
 }
 
 # exact classpath determination
@@ -165,19 +164,16 @@ _comp_cmd_java()
             return
             ;;
         -javaagent:*)
-            cur=${cur#*:}
-            _comp_compgen filedir '@(jar|zip)'
+            _comp_compgen -c "${cur#*:}" filedir '@(jar|zip)'
             return
             ;;
         -agentpath:*)
-            cur=${cur#*:}
-            _comp_compgen filedir so
+            _comp_compgen -c "${cur#*:}" filedir so
             return
             ;;
         # various non-standard option completions
         -splash:*)
-            cur=${cur#*:}
-            _comp_compgen filedir '@(gif|jp?(e)g|png)'
+            _comp_compgen -c "${cur#*:}" filedir '@(gif|jp?(e)g|png)'
             return
             ;;
         -Xbootclasspath*:*)
@@ -199,8 +195,7 @@ _comp_cmd_java()
             return
             ;;
         -Xloggc:* | -Xverboselog:*)
-            cur=${cur#*:}
-            _comp_compgen filedir
+            _comp_compgen -c "${cur#*:}" filedir
             return
             ;;
         -Xshare:*)
diff --git a/completions/kcov b/completions/kcov
@@ -21,8 +21,7 @@ _comp_cmd_kcov()
             ;;
         --replace-src-path)
             if [[ $cur == ?*:* ]]; then
-                cur="${cur##*:}"
-                _comp_compgen filedir
+                _comp_compgen -c "${cur##*:}" filedir
             else
                 _comp_compgen filedir
                 compopt -o nospace
diff --git a/completions/lilo b/completions/lilo
@@ -35,8 +35,7 @@ _comp_cmd_lilo()
             ;;
         -A | -b | -M | -u | -U)
             # device completion
-            : "${cur:=/dev/}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur:-/dev/}" filedir
             return
             ;;
         -T)
diff --git a/completions/lvm b/completions/lvm
@@ -2,8 +2,7 @@
 
 _comp_cmd_lvm__filedir()
 {
-    : "${cur:=/dev/}"
-    _comp_compgen filedir
+    _comp_compgen -c "${cur:-/dev/}" filedir
 }
 
 _comp_cmd_lvm__volumegroups()
diff --git a/completions/mdadm b/completions/mdadm
@@ -145,8 +145,7 @@ _comp_cmd_mdadm()
         fi
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        : "${cur:=/dev/}"
-        _comp_compgen filedir
+        _comp_compgen -c "${cur:-/dev/}" filedir
     fi
 } &&
     complete -F _comp_cmd_mdadm mdadm
diff --git a/completions/mplayer b/completions/mplayer
@@ -110,8 +110,7 @@ _comp_cmd_mplayer()
             return
             ;;
         -mixer | -dvdauth | -fb | -zrdev)
-            : "${cur:=/dev/}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur:-/dev/}" filedir
             return
             ;;
         -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
diff --git a/completions/mutt b/completions/mutt
@@ -149,7 +149,7 @@ _comp_cmd_mutt__filedir()
             command sed -e 's|^spoolfile=\"\(.*\)\"$|\1|')"
         [[ $spoolfile ]] && eval cur="${cur/^!/$spoolfile}"
     fi
-    _comp_compgen filedir
+    _comp_compgen -c "$cur" filedir
 }
 
 _comp_cmd_mutt()
diff --git a/completions/nsupdate b/completions/nsupdate
@@ -14,8 +14,7 @@ _comp_cmd_nsupdate()
             return
             ;;
         -*R)
-            : "${cur:=/dev/}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur:-/dev/}" filedir
             return
             ;;
         -*y)
diff --git a/completions/perltidy b/completions/perltidy
@@ -17,8 +17,7 @@ _comp_cmd_perltidy()
 
     case $cur in
         -pro=* | --profile=*)
-            cur="${cur#*=}"
-            _comp_compgen filedir
+            _comp_compgen -c "${cur#*=}" filedir
             return
             ;;
         -ole=* | --output-line-ending=*)
diff --git a/completions/povray b/completions/povray
@@ -16,7 +16,7 @@ _comp_cmd_povray()
             cur="${povcur#[-+]I}" # to confuse _comp_compgen_filedir
             pfx="${povcur%"$cur"}"
             _comp_compgen filedir pov
-            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/$pfx}")
             return
             ;;
         [-+]O*)
@@ -40,7 +40,7 @@ _comp_cmd_povray()
             cur="${povcur#[-+]O}" # to confuse _comp_compgen_filedir
             pfx="${povcur%"$cur"}"
             _comp_compgen -a filedir $oext
-            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/$pfx}")
             return
             ;;
         *.ini\[ | *.ini\[*[^]]) # sections in .ini files
@@ -52,7 +52,7 @@ _comp_cmd_povray()
                     -e 't' -e 'd' -- "$pfx"
             ))
             # to prevent [bar] expand to nothing.  can be done more easily?
-            COMPREPLY=("${COMPREPLY[@]/#/${pfx}[}")
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/${pfx}[}")
             return
             ;;
         *)
diff --git a/completions/protoc b/completions/protoc
@@ -34,15 +34,13 @@ _comp_cmd_protoc()
 
     case $cur in
         -o*)
-            cur=${cur:2}
-            _comp_compgen filedir
-            COMPREPLY=("${COMPREPLY[@]/#/-o}")
+            _comp_compgen -c "${cur:2}" filedir
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/-o}")
             return
             ;;
         -I*)
-            cur=${cur:2}
-            _comp_compgen filedir -d
-            COMPREPLY=("${COMPREPLY[@]/#/-I}")
+            _comp_compgen -c "${cur:2}" filedir -d
+            ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/#/-I}")
             return
             ;;
         -*)
diff --git a/completions/smartctl b/completions/smartctl
@@ -124,8 +124,7 @@ _comp_cmd_smartctl()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        : "${cur:=/dev/}"
-        _comp_compgen filedir
+        _comp_compgen -c "${cur:-/dev/}" filedir
     fi
 } &&
     complete -F _comp_cmd_smartctl smartctl
diff --git a/completions/ssh b/completions/ssh
@@ -341,11 +341,9 @@ _comp_cmd_ssh()
     esac
 
     if [[ $cur == -F* ]]; then
-        cur=${cur#-F}
-        _comp_compgen filedir
+        _comp_compgen -c "${cur#-F}" filedir
         # Prefix completions with '-F'
         COMPREPLY=("${COMPREPLY[@]/#/-F}")
-        cur=-F$cur # Restore cur
     elif [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
@@ -416,11 +414,9 @@ _comp_cmd_sftp()
     esac
 
     if [[ $cur == -F* ]]; then
-        cur=${cur#-F}
-        _comp_compgen filedir
+        _comp_compgen -c "${cur#-F}" filedir
         # Prefix completions with '-F'
         COMPREPLY=("${COMPREPLY[@]/#/-F}")
-        cur=-F$cur # Restore cur
     elif [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
diff --git a/completions/ssh-keygen b/completions/ssh-keygen
@@ -82,8 +82,7 @@ _comp_cmd_ssh_keygen()
                         COMPREPLY=($(compgen -c -- "${cur#*=}"))
                         ;;
                     checkpoint=* | challenge=* | write-attestation=*)
-                        cur=${cur#*=}
-                        _comp_compgen filedir
+                        _comp_compgen -c "${cur#*=}" filedir
                         ;;
                     application=*([^:=]))
                         COMPREPLY=($(compgen -W "ssh:" -- "${cur#*=}"))

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@ _comp_cmd_cryptsetup__name()`
`7`	`7`
`8`	`8`	`_comp_cmd_cryptsetup__device()`
`9`	`9`	`{`
`10`		`- : "${cur:=/dev/}"`
`11`		`- _comp_compgen filedir`
	`10`	`+ _comp_compgen -c "${cur:-/dev/}" filedir`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`_comp_cmd_cryptsetup()`