Merge pull request #887 from akinomyoga/failglob-2

scop · web-flow · commit 68067084e9d8 · 2023-04-05T22:06:38.000+03:00
refactor(completions/*): ensure quoting for `compgen -W '${arr[@]}'`
diff --git a/bash_completion b/bash_completion
@@ -820,7 +820,8 @@ _comp_delimited()
                     fi
                 done
             done
-            COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "${cur##*"$delimiter"}"))
+            ((${#COMPREPLY[@]})) &&
+                COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "${cur##*"$delimiter"}"))
         fi
     else
         COMPREPLY=($(compgen "$@" -- "${cur##*"$delimiter"}"))
diff --git a/completions/ccze b/completions/ccze
@@ -25,7 +25,7 @@ _ccze()
             ;;
         --option | -${noargopts}o)
             local -a opts=(scroll wordcolor lookups transparent cssfile)
-            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]/#/no}' -- "$cur"))
+            COMPREPLY=($(compgen -W '"${opts[@]}" "${opts[@]/#/no}"' -- "$cur"))
             return
             ;;
         --plugin | -${noargopts}p)
diff --git a/completions/complete b/completions/complete
@@ -40,7 +40,7 @@ _complete()
         local -a opts=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
         # -F, -C do not work the expected way with compgen
         [[ $1 != *compgen ]] || opts=("${opts[@]//-[FC]/}")
-        COMPREPLY=($(compgen -W '${opts[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${opts[@]}"' -- "$cur"))
     else
         COMPREPLY=($(compgen -A command -- "$cur"))
     fi
diff --git a/completions/crontab b/completions/crontab
@@ -36,7 +36,7 @@ _crontab()
     done
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '${!opts[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${!opts[@]}"' -- "$cur"))
         return
     fi
 
diff --git a/completions/curl b/completions/curl
@@ -113,7 +113,7 @@ _curl()
                     # Looks like an option? Likely no --help category support
                     [[ $x != -* ]] || return
                 done
-                COMPREPLY=($(compgen -W '${categories[@]}' -- "$cur"))
+                COMPREPLY=($(compgen -W '"${categories[@]}"' -- "$cur"))
             fi
             return
             ;;
diff --git a/completions/cvs b/completions/cvs
@@ -41,7 +41,8 @@ _comp_xfunc_cvs_roots()
     [[ -v CVSROOT ]] && cvsroots=("$CVSROOT")
     [[ -r ~/.cvspass ]] && cvsroots+=($(awk '{ print $2 }' ~/.cvspass))
     [[ -r CVS/Root ]] && mapfile -tO ${#cvsroots[@]} cvsroots <CVS/Root
-    COMPREPLY=($(compgen -W '${cvsroots[@]}' -- "$cur"))
+    ((${#cvsroots[@]})) &&
+        COMPREPLY=($(compgen -W '"${cvsroots[@]}"' -- "$cur"))
     __ltrim_colon_completions "$cur"
 }
 
diff --git a/completions/dpkg b/completions/dpkg
@@ -139,9 +139,9 @@ _comp_cmd_dpkg_reconfigure()
         --frontend | -${noargopts}f)
             _comp_expand_glob opt '/usr/share/perl5/Debconf/FrontEnd/*'
             if ((${#opt[@]})); then
-                opt=(${opt[@]##*/})
-                opt=(${opt[@]%.pm})
-                COMPREPLY=($(compgen -W '${opt[@]}' -- "$cur"))
+                opt=("${opt[@]##*/}")
+                opt=("${opt[@]%.pm}")
+                COMPREPLY=($(compgen -W '"${opt[@]}"' -- "$cur"))
             fi
             return
             ;;
diff --git a/completions/hunspell b/completions/hunspell
@@ -16,7 +16,7 @@ _hunspell()
                 dicts=("${dicts[@]##*/}")
                 dicts=("${dicts[@]%.dic}")
                 local IFS=$'\n'
-                COMPREPLY=($(compgen -W '${dicts[@]}' -- "$cur"))
+                COMPREPLY=($(compgen -W '"${dicts[@]}"' -- "$cur"))
             fi
             return
             ;;
diff --git a/completions/ipmitool b/completions/ipmitool
@@ -76,7 +76,7 @@ _ipmitool()
     done
 
     if ! "$has_cmd"; then
-        COMPREPLY=($(compgen -W '${cmds[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${cmds[@]}"' -- "$cur"))
         return
     fi
 
diff --git a/completions/lintian b/completions/lintian
@@ -2,16 +2,14 @@
 
 _lintian_tags()
 {
-    local match search tags check_files
+    local search tags check_files
     _comp_expand_glob check_files '/usr/share/lintian/checks/*.desc'
     ((${#check_files[@]})) || return 0
 
     tags=$(awk '/^Tag/ { print $2 }' "${check_files[@]}")
     if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
-            match=$(command grep -nE "^Tag: $item$" \
-                "${check_files[@]}" | cut -d: -f1)
             tags=$(command sed -e "s/\<$item\>//g" <<<"$tags")
         done
         COMPREPLY+=($(compgen -W "$tags"))
@@ -50,7 +48,7 @@ _lintian_checks()
 
 _lintian_infos()
 {
-    local match search infos collection_files
+    local search infos collection_files
     _comp_expand_glob collection_files '/usr/share/lintian/collection/*.desc'
     ((${#collection_files[@]})) || return 0
 
@@ -59,8 +57,6 @@ _lintian_infos()
     if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
-            match=$(command grep -nE "^Collector: $item$" \
-                "${collection_files[@]}" | cut -d: -f1)
             infos=$(command sed -e "s/\<$item\>//g" <<<"$infos")
         done
         COMPREPLY+=($(compgen -W "$infos"))
diff --git a/completions/minicom b/completions/minicom
@@ -19,7 +19,7 @@ _minicom()
         --ptty | -${noargopts}p)
             _comp_expand_glob COMPREPLY '/dev/tty*'
             ((${#COMPREPLY[@]})) &&
-                COMPREPLY=($(compgen -W '"${COMPREPLY[@]}" "${COMPREPLY[@]#/dev/}}' \
+                COMPREPLY=($(compgen -W '"${COMPREPLY[@]}" "${COMPREPLY[@]#/dev/}"' \
                     -- "$cur"))
             return
             ;;
@@ -34,7 +34,7 @@ _minicom()
     fi
 
     local -a files
-    _comp_expand_glob files '/etc/minirc.* /etc/minicom/minirc.* ~/.minirc.*'
+    _comp_expand_glob files '{/etc/,/etc/minicom/,~/.}minirc.?*'
     ((${#files[@]})) &&
         COMPREPLY=($(compgen -W '"${files[@]##*minirc.}"' -- "$cur"))
 } &&
diff --git a/completions/mplayer b/completions/mplayer
@@ -60,9 +60,9 @@ _mplayer()
             cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
             if ((${#cp[@]})); then
                 if [[ $cur == "${cur,,}" ]]; then
-                    COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
+                    COMPREPLY=($(compgen -W '"${cp[@],,}"' -- "$cur"))
                 else
-                    COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
+                    COMPREPLY=($(compgen -W '"${cp[@]^^}"' -- "$cur"))
                 fi
             fi
             return
diff --git a/completions/mysql b/completions/mysql
@@ -8,7 +8,7 @@ _comp_xfunc_mysql_character_sets()
     charsets=("${charsets[@]##*/}")
     charsets=("${charsets[@]%.xml}")
     local IFS=$'\n'
-    COMPREPLY+=($(compgen -W '${charsets[@]}' -X '' -- "$cur"))
+    COMPREPLY+=($(compgen -W '"${charsets[@]}"' -X '' -- "$cur"))
 }
 
 _comp_deprecate_func _mysql_character_sets _comp_xfunc_mysql_character_sets
diff --git a/completions/nslookup b/completions/nslookup
@@ -20,7 +20,7 @@ _bind_querytype()
     # Selected obsolete record types
     types+=(SPF)
 
-    COMPREPLY+=($(compgen -W '${types[@]}' -- "$cur"))
+    COMPREPLY+=($(compgen -W '"${types[@]}"' -- "$cur"))
 }
 
 _nslookup()
diff --git a/completions/pkg-get b/completions/pkg-get
@@ -59,14 +59,14 @@ _pkg_get_get_catalog_file()
 
         if [[ ${cur} == -* ]]; then
             local -a opts=(-c -d -D -f -i -l -s -S -u -U -v)
-            COMPREPLY=($(compgen -W '${opts[@]}' -- "${cur}"))
+            COMPREPLY=($(compgen -W '"${opts[@]}"' -- "${cur}"))
             return
         fi
 
         local -a commands=(
             available describe download install list updatecatalog upgrade
         )
-        COMPREPLY=($(compgen -W '${commands[@]}' -- "${cur}"))
+        COMPREPLY=($(compgen -W '"${commands[@]}"' -- "${cur}"))
     } &&
         complete -F _pkg_get pkg-get
 
diff --git a/completions/pkgadd b/completions/pkgadd
@@ -37,24 +37,23 @@ _pkgadd()
         *)
             if [[ ${cur} == -* ]]; then
                 local -a opts=(-a -A -d -k -n -M -P -r -R -s -v -V -x)
-                COMPREPLY=($(compgen -W '${opts[@]}' -- "${cur}"))
+                COMPREPLY=($(compgen -W '"${opts[@]}"' -- "${cur}"))
             else
-                local pkginst_list
+                local -a pkginst_list
                 if [[ -d $device ]]; then
-                    local -a tmplist
-                    for filedir in $(/bin/ls -1 "$device"); do
-                        if [[ -d "$device/$filedir" && -f "$device/$filedir/pkginfo" ]]; then
-                            tmplist+=(${tmplist[@]-} "$filedir")
-                        fi
-                    done
-                    pkginst_list="${tmplist[*]}"
+                    _comp_expand_glob pkginst_list '"$device"/*/pkginfo'
+                    if ((${#pkginst_list[@]})); then
+                        pkginst_list=("${pkginst_list[@]#"$device/"}")
+                        pkginst_list=("${pkginst_list[@]%/pkginfo}")
+                    fi
                 else
                     local ret
                     _comp_dequote "$device"
-                    pkginst_list="$(strings "$ret" |
-                        command grep ^PKG= | sort -u | cut -d= -f2)"
+                    _comp_split -l pkginst_list "$(strings "${ret-}" |
+                        command sed -n 's/^PKG=//p' | sort -u)"
                 fi
-                COMPREPLY=($(compgen -W "$pkginst_list" -- "${cur}"))
+                ((${#pkginst_list[@]})) &&
+                    COMPREPLY=($(compgen -W '"${pkginst_list[@]}"' -- "${cur}"))
             fi
             ;;
     esac
diff --git a/completions/pkgutil b/completions/pkgutil
@@ -108,7 +108,7 @@ _pkgutil()
         --findfile --deptree --extract --stream --output --target --single
         --param --parse --cleanup --catinfo
     )
-    COMPREPLY=($(compgen -W '${commands[@]}' -- "$cur"))
+    COMPREPLY=($(compgen -W '"${commands[@]}"' -- "$cur"))
 
 } &&
     complete -F _pkgutil pkgutil
diff --git a/completions/rpm b/completions/rpm
@@ -130,7 +130,7 @@ _rpm()
     case ${words[1]} in
         -[iFU]* | --install | --freshen | --upgrade)
             if [[ $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '${opts[@]} --percent --force --test
+                COMPREPLY=($(compgen -W '"${opts[@]}" --percent --force --test
                 --replacepkgs --replacefiles --root --excludedocs --includedocs
                 --noscripts --ignorearch --dbpath --prefix= --ignoreos --nodeps
                 --allfiles --ftpproxy --ftpport --justdb --httpproxy --httpport
@@ -143,7 +143,7 @@ _rpm()
             ;;
         -e | --erase)
             if [[ $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '${opts[@]} --allmatches --noscripts
+                COMPREPLY=($(compgen -W '"${opts[@]}" --allmatches --noscripts
                     --notriggers --nodeps --test --repackage' -- "$cur"))
             else
                 _comp_xfunc_rpm_installed_packages "$1"
@@ -163,7 +163,7 @@ _rpm()
             if [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '${opts[@]} --dbpath --fscontext
+                    COMPREPLY=($(compgen -W '"${opts[@]}" --dbpath --fscontext
                         --last --root --state' -- "$cur"))
                 else
                     _filedir
@@ -174,15 +174,15 @@ _rpm()
             elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '${opts[@]} --ftpport --ftpproxy
+                    COMPREPLY=($(compgen -W '"${opts[@]}" --ftpport --ftpproxy
                         --httpport --httpproxy --nomanifest' -- "$cur"))
                 else
                     _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '${opts[@]} --all --file --fileid
+                    COMPREPLY=($(compgen -W '"${opts[@]}" --all --file --fileid
                         --dbpath --fscontext --ftswalk --group --hdrid --last
                         --package --pkgid --root= --specfile --state
                         --triggeredby --whatenhances --whatprovides
@@ -195,15 +195,15 @@ _rpm()
             ;;
         -K* | --checksig)
             if [[ $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '${opts[@]} --nopgp --nogpg --nomd5' \
+                COMPREPLY=($(compgen -W '"${opts[@]}" --nopgp --nogpg --nomd5' \
                     -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
         -[Vy]* | --verify)
             if [[ $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '${opts[@]} --root= --dbpath --nodeps
+                COMPREPLY=($(compgen -W '"${opts[@]}" --root= --dbpath --nodeps
                     --nogroup --nolinkto --nomode --nomtime --nordev --nouser
                     --nofiles --noscripts --nomd5 --querytags --specfile
                     --whatenhances --whatprovides --whatrecommends
diff --git a/completions/screen b/completions/screen
@@ -7,7 +7,7 @@ _screen_sessions()
     ((${#sessions[@]} == 0)) && return
     if [[ $cur == +([0-9])?(.*) ]]; then
         # Complete sessions including pid prefixes
-        COMPREPLY=($(compgen -W '${sessions[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${sessions[@]}"' -- "$cur"))
     else
         # Create unique completions, dropping pids where possible
         local -A res
diff --git a/completions/ssh b/completions/ssh
@@ -179,7 +179,7 @@ _ssh_suboption()
             local protocols=($(_comp_xfunc_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
             if ((${#protocols[@]} > 1)); then
-                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
+                COMPREPLY=($(compgen -W '"${protocols[@]}"' -- "$cur"))
             fi
             ;;
         proxyjump)
diff --git a/completions/tipc b/completions/tipc
@@ -157,7 +157,7 @@ _tipc()
                         done
                     done
 
-                    COMPREPLY=($(compgen -W '${params[@]}' -- "$cur"))
+                    COMPREPLY=($(compgen -W '"${params[@]}"' -- "$cur"))
                     ;;
                 disable)
                     ((optind++))
diff --git a/completions/tune2fs b/completions/tune2fs
@@ -27,15 +27,15 @@ _tune2fs()
             local -a opts=(^debug ^bsdgroups ^user_xattr ^acl ^uid16
                 ^journal_data ^journal_data_ordered ^journal_data_writeback
                 ^nobarrier ^block_validity ^discard ^nodelalloc)
-            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur"))
+            COMPREPLY=($(compgen -W '"${opts[@]}" "${opts[@]#^}"' -- "$cur"))
             return
             ;;
         -*O)
             local -a opts=(^dir_index ^dir_nlink ^encrypt ^extent ^extra_isize
                 ^filetype ^flex_bg ^has_journal ^huge_file ^large_file
                 ^metadata_csum ^mmp ^project ^quota ^read-only ^resize_inode
                 ^sparse_super ^uninit_bg)
-            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur"))
+            COMPREPLY=($(compgen -W '"${opts[@]}" "${opts[@]#^}"' -- "$cur"))
             return
             ;;
         -*u)
diff --git a/completions/update-rc.d b/completions/update-rc.d
@@ -17,7 +17,7 @@ _update_rc_d()
     options=(-f -n)
 
     if [[ $cword -eq 1 || $prev == -* ]]; then
-        COMPREPLY=($(compgen -W '${options[@]} ${services[@]+"${services[@]}"}' \
+        COMPREPLY=($(compgen -W '"${options[@]}" ${services[@]+"${services[@]}"}' \
             -X '$(tr " " "|" <<<${words[@]})' -- "$cur"))
     elif ((${#services[@]})) && [[ $prev == ?($(tr " " "|" <<<"${services[*]}")) ]]; then
         COMPREPLY=($(compgen -W 'remove defaults start stop' -- "$cur"))
diff --git a/completions/vpnc b/completions/vpnc
@@ -73,7 +73,7 @@ _vpnc()
             configs=("${configs[@]%.conf}")
             local IFS=$'\n'
             compopt -o filenames
-            COMPREPLY=($(compgen -W '${configs[@]}' -- "$cur"))
+            COMPREPLY=($(compgen -W '"${configs[@]}"' -- "$cur"))
         fi
     fi
 } &&
diff --git a/completions/wodim b/completions/wodim
@@ -84,10 +84,10 @@ _cdrecord()
     # files are always eligible completion
     _filedir
     # track options are always available
-    COMPREPLY+=($(compgen -W '${track_options[@]}' -- "$cur"))
+    COMPREPLY+=($(compgen -W '"${track_options[@]}"' -- "$cur"))
     # general options are no more available after file or track option
     if ((track_mode == 0)); then
-        COMPREPLY+=($(compgen -W '${generic_options[@]}' -- "$cur"))
+        COMPREPLY+=($(compgen -W '"${generic_options[@]}"' -- "$cur"))
     fi
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ _comp_xfunc_cvs_roots()`
`41`	`41`	`[[ -v CVSROOT ]] && cvsroots=("$CVSROOT")`
`42`	`42`	`[[ -r ~/.cvspass ]] && cvsroots+=($(awk '{ print $2 }' ~/.cvspass))`
`43`	`43`	`[[ -r CVS/Root ]] && mapfile -tO ${#cvsroots[@]} cvsroots <CVS/Root`
`44`		`- COMPREPLY=($(compgen -W '${cvsroots[@]}' -- "$cur"))`
	`44`	`+ ((${#cvsroots[@]})) &&`
	`45`	`+ COMPREPLY=($(compgen -W '"${cvsroots[@]}"' -- "$cur"))`
`45`	`46`	`__ltrim_colon_completions "$cur"`
`46`	`47`	`}`
`47`	`48`