Merge pull request #887 from akinomyoga/failglob-2

refactor(completions/*): ensure quoting for `compgen -W '${arr[@]}'`

Author: scop

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"}"))

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)

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

completions/crontab

@@ -36,7 +36,7 @@ _crontab()
     done
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '${!opts[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${!opts[@]}"' -- "$cur"))
         return
     fi
 

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
             ;;

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"
 }
 

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
             ;;

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
             ;;

completions/ipmitool

@@ -76,7 +76,7 @@ _ipmitool()
     done
 
     if ! "$has_cmd"; then
-        COMPREPLY=($(compgen -W '${cmds[@]}' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${cmds[@]}"' -- "$cur"))
         return
     fi
 

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"))