Merge pull request #961 from scop/refactor/dpkg-funcs

refactor: dpkg xfuncs to API behavior

Author: scop

completions/apt-build

@@ -19,8 +19,7 @@ _comp_cmd_apt_build()
                 COMPREPLY=($(_comp_xfunc apt-cache packages))
                 ;;
             remove)
-                COMPREPLY=(
-                    $(_comp_xfunc dpkg installed_packages "$cur"))
+                _comp_xfunc dpkg installed_packages
                 ;;
         esac
         return

completions/apt-get

@@ -4,9 +4,7 @@ _comp_xfunc_apt_get_installed_packages()
 {
     if [[ -f /etc/debian_version ]]; then
         # Debian system
-        COMPREPLY=($(
-            _comp_xfunc dpkg installed_packages "$cur"
-        ))
+        _comp_xfunc dpkg installed_packages
     else
         # assume RPM based
         _comp_xfunc rpm installed_packages

completions/aptitude

@@ -1,19 +1,5 @@
 # Debian aptitude(1) completion                            -*- shell-script -*-
 
-# TODO: rename per API conventions, rework to use vars rather than outputting
-if _comp_have_command grep-status; then
-    _comp_dpkg_hold_packages()
-    {
-        grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
-    }
-else
-    _comp_dpkg_hold_packages()
-    {
-        command grep -B 2 'hold' /var/lib/dpkg/status |
-            awk "/Package: $1/ { print \$2 }"
-    }
-fi
-
 _comp_cmd_aptitude()
 {
     local cur prev words cword comp_args
@@ -36,12 +22,11 @@ _comp_cmd_aptitude()
                 return
                 ;;
             purge | remove | reinstall | forbid-version)
-                COMPREPLY=(
-                    $(_comp_xfunc dpkg installed_packages "$cur"))
+                _comp_xfunc dpkg installed_packages
                 return
                 ;;
             unhold)
-                COMPREPLY=($(_comp_dpkg_hold_packages "$cur"))
+                _comp_xfunc dpkg held_packages
                 return
                 ;;
         esac

completions/dpkg

@@ -1,37 +1,63 @@
 # dpkg(1) and related commands completion                  -*- shell-script -*-
 
-if _comp_have_command grep-status; then
-    _comp_xfunc_dpkg_installed_packages()
-    {
-        grep-status -P -e "^${1-}" -a -FStatus 'ok installed' -n -s Package
-    }
-
-    _comp_xfunc_dpkg_purgeable_packages()
-    {
-        grep-status -P -e "^${1-}" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
-    }
-else
-    _comp_xfunc_dpkg_installed_packages()
-    {
-        command awk -F '\n' -v RS="" "
-            index(\$1, \"Package: ${1-}\") == 1 &&
+# @since 2.12
+_comp_xfunc_dpkg_installed_packages()
+{
+    local pkgs
+    pkgs=$(
+        grep-status -P -e "^${cur-}" -a \
+            -FStatus 'ok installed' \
+            -n -s Package 2>/dev/null ||
+            command awk -F '\n' -v RS="" "
+            index(\$1, \"Package: ${cur-}\") == 1 &&
             \$2 ~ /ok installed|half-installed|unpacked|half-configured|^Essential: yes/ {
                 print(substr(\$1, 10));
             }" /var/lib/dpkg/status 2>/dev/null
-    }
+    )
+    _comp_compgen -a -- -W '$pkgs'
+}
 
-    _comp_xfunc_dpkg_purgeable_packages()
-    {
-        command awk -F '\n' -v RS="" "
-            index(\$1, \"Package: ${1-}\") == 1 &&
+# @since 2.12
+_comp_xfunc_dpkg_purgeable_packages()
+{
+    local pkgs
+    pkgs=$(
+        grep-status -P -e "^${cur-}" -a \
+            -FStatus 'ok installed' -o -FStatus 'ok config-files' \
+            -n -s Package 2>/dev/null ||
+            command awk -F '\n' -v RS="" "
+            index(\$1, \"Package: ${cur-}\") == 1 &&
             \$2 ~ /ok installed|half-installed|unpacked|half-configured|config-files|^Essential: yes/ {
                 print(substr(\$1, 10));
             }" /var/lib/dpkg/status 2>/dev/null
-    }
-fi
+    )
+    _comp_compgen -a -- -W '$pkgs'
+}
 
-_comp_deprecate_func _comp_dpkg_installed_packages _comp_xfunc_dpkg_installed_packages
-_comp_deprecate_func _comp_dpkg_purgeable_packages _comp_xfunc_dpkg_purgeable_packages
+# @since 2.12
+_comp_xfunc_dpkg_held_packages()
+{
+    local pkgs=$(dpkg --get-selections ${cur:+"$cur}"} |
+        awk '{for(i=2;i<=NF;i++){ if($i=="hold"){ print $1;break }}}')
+    _comp_compgen -a -- -W '$pkgs'
+}
+
+# @deprecated 2.12 use _comp_xfunc_dpkg_installed_packages instead
+_comp_dpkg_installed_packages()
+{
+    local COMPREPLY=() cur="${1-}"
+    # shellcheck disable=SC2119
+    _comp_xfunc_dpkg_installed_packages
+    printf "%s\n" "${COMPREPLY[@]}"
+}
+# @deprecated 2.12 use _comp_xfunc_dpkg_purgeable_packages instead
+_comp_dpkg_purgeable_packages()
+{
+    local COMPREPLY=() cur="${1-}"
+    # shellcheck disable=SC2119
+    _comp_xfunc_dpkg_purgeable_packages
+    printf "%s\n" "${COMPREPLY[@]}"
+}
 
 # Debian dpkg(1) completion
 #
@@ -78,11 +104,11 @@ _comp_cmd_dpkg()
             return
             ;;
         --remove | --verify | -${noargopts}[rV])
-            COMPREPLY=($(_comp_xfunc_dpkg_installed_packages "$cur"))
+            _comp_xfunc_dpkg_installed_packages
             return
             ;;
         --listfiles | --purge | -${noargopts}[LP])
-            COMPREPLY=($(_comp_xfunc_dpkg_purgeable_packages "$cur"))
+            _comp_xfunc_dpkg_purgeable_packages
             return
             ;;
         --debug | -${noargopts}D)
@@ -153,7 +179,7 @@ _comp_cmd_dpkg_reconfigure()
         COMPREPLY=($(compgen -W '--frontend --priority --all --unseen-only
             --help --showold --force --terse' -- "$cur"))
     else
-        COMPREPLY=($(_comp_xfunc_dpkg_installed_packages "$cur"))
+        _comp_xfunc_dpkg_installed_packages
     fi
 } &&
     complete -F _comp_cmd_dpkg_reconfigure -o default dpkg-reconfigure