refactor(ant,pkg-get,pkgutil,rpm,ssh): adjust towards current API

Author: scop

completions/ant

@@ -1,6 +1,6 @@
 # bash completion for ant and phing                        -*- shell-script -*-
 
-_ant_parse_targets()
+_comp_cmd_ant__targets()
 {
     local line basedir
 
@@ -9,7 +9,7 @@ _ant_parse_targets()
     # parse buildfile for targets
     while read -rd '>' line; do
         if [[ $line =~ \<(target|extension-point)[[:space:]].*name=[\"\']([^\"\']+) ]]; then
-            targets+=" ${BASH_REMATCH[2]}"
+            ret+=("${BASH_REMATCH[2]}")
         fi
     done <"$1"
 
@@ -19,7 +19,7 @@ _ant_parse_targets()
             local imported_buildfile
             imported_buildfile="${basedir}/${BASH_REMATCH[1]}"
             if [[ -f $imported_buildfile ]]; then
-                _ant_parse_targets "$imported_buildfile"
+                "$FUNCNAME" "$imported_buildfile"
             fi
         fi
     done <"$1"
@@ -87,12 +87,12 @@ _comp_cmd_ant()
         fi
         [[ ! -f $buildfile ]] && return
 
-        local targets
+        local ret=()
 
         # fill targets
-        _ant_parse_targets "$buildfile"
+        _comp_cmd_ant__targets "$buildfile"
 
-        COMPREPLY=($(compgen -W '$targets' -- "$cur"))
+        COMPREPLY=($(compgen -W '"${ret[@]}"' -- "$cur"))
     fi
 } &&
     complete -F _comp_cmd_ant ant phing

completions/pkg-get

@@ -2,10 +2,10 @@
 #
 # Copyright 2006 Yann Rouillard <[email protected]>
 
-_pkg_get_get_catalog_file()
+_comp_cmd_pkg_get__catalog_file()
 {
     local url="$1"
-    local catalog_file i conffile
+    local i conffile
 
     for file in /etc/opt/csw/pkg-get.conf /opt/csw/etc/pkg-get.conf /etc/pkg-get.conf; do
         if [[ -f $file ]]; then
@@ -19,15 +19,13 @@ _pkg_get_get_catalog_file()
         url=$(awk -F= ' $1=="url" { print $2 }' "$conffile")
     fi
 
-    catalog_file="${url##*//}"
-    catalog_file="${catalog_file%%/*}"
-    catalog_file="/var/pkg-get/catalog-$catalog_file"
-
-    echo "$catalog_file"
+    ret="${url##*//}"
+    ret="${ret%%/*}"
+    ret="/var/pkg-get/catalog-$ret"
 } &&
     _comp_cmd_pkg_get()
     {
-        local cur prev file catalog_file url command=""
+        local cur prev file url command=""
         COMPREPLY=()
         cur="${COMP_WORDS[COMP_CWORD]}"
         prev="${COMP_WORDS[COMP_CWORD - 1]}"
@@ -48,9 +46,10 @@ _pkg_get_get_catalog_file()
 
         if [[ $command ]]; then
             if [[ $command == @(-[Ddi]|describe|download|install) ]]; then
-                catalog_file=$(_pkg_get_get_catalog_file "$url")
-                if [[ -f $catalog_file ]]; then
-                    local packages_list=$(awk '$0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' "$catalog_file")
+                local ret
+                _comp_cmd_pkg_get__catalog_file "$url"
+                if [[ -f $ret ]]; then
+                    local packages_list=$(awk '$0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' "$ret")
                     COMPREPLY=($(compgen -W "${packages_list}" -- "${cur}"))
                 fi
             fi

completions/pkgutil

@@ -1,15 +1,15 @@
 # pkgutil completion                                        -*- shell-script -*-
 # Copyright 2006 Yann Rouillard <[email protected]>
 
-_pkgutil_url2catalog()
+_comp_cmd_pkgutil__url2catalog()
 {
     local filename="$1"
 
     filename="${filename##*://}"
     filename="${filename//\//_}"
     filename="/var/opt/csw/pkgutil/catalog.${filename}_$(uname -p)_$(uname -r)"
 
-    echo "$filename"
+    ret=$filename
 }
 
 _comp_cmd_pkgutil()
@@ -22,12 +22,12 @@ _comp_cmd_pkgutil()
         "/opt/csw/etc/pkgutil.conf" "/etc/opt/csw/pkgutil.conf")
     declare -a catalog_files=()
 
-    local i=$cword
+    local i=$cword ret
     while ((i-- > 1)); do
         if [[ ${words[i]} == -@(t|-temp) ]]; then
             local url="${words[i + 1]}"
-            local catalog=$(_pkgutil_url2catalog "$url")
-            catalog_files=("$catalog")
+            _comp_cmd_pkgutil__url2catalog "$url"
+            catalog_files=("$ret")
         elif [[ ${words[i]} == --config ]]; then
             local ret
             _comp_dequote "${words[i + 1]}"
@@ -81,8 +81,8 @@ _comp_cmd_pkgutil()
         mirrors=$(awk -F= ' $1 ~ /^ *mirror *$/ { print $2 }' "${configuration_files[@]}")
         mirrors=${mirrors:-http://mirror.opencsw.org/opencsw/testing}
         for mirror_url in $mirrors; do
-            local catalog=$(_pkgutil_url2catalog "$mirror_url")
-            catalog_files=("${catalog_files[@]}" "$catalog")
+            _comp_cmd_pkgutil__url2catalog "$mirror_url"
+            catalog_files+=("$ret")
         done
 
         if [[ $command == -@([dius]|-download|-install|-upgrade|-stream) ]]; then

completions/rpm

@@ -36,7 +36,7 @@ _comp_cmd_rpm__macros()
         -- "$cur"))
 }
 
-_rpm_buildarchs()
+_comp_cmd_rpm__buildarchs()
 {
     COMPREPLY=($(compgen -W "$("${1:-rpm}" --showrc | command sed -ne \
         's/^\s*compatible\s\s*build\s\s*archs\s*:\s*\(.*\)/\1/ p')" \
@@ -255,7 +255,7 @@ _comp_cmd_rpmbuild()
             return
             ;;
         --target)
-            _rpm_buildarchs "$rpm"
+            _comp_cmd_rpm__buildarchs "$rpm"
             return
             ;;
         --eval | -${noargopts}E)

completions/ssh

@@ -229,7 +229,8 @@ _comp_xfunc_ssh_suboption_check()
 _comp_deprecate_func _ssh_suboption_check _comp_xfunc_ssh_suboption_check
 
 # Search COMP_WORDS for '-F configfile' or '-Fconfigfile' argument
-_ssh_configfile()
+# @var[out] configfile   Found configfile, if any
+_comp_cmd_ssh__configfile()
 {
     set -- "${words[@]}"
     while (($# > 0)); do
@@ -267,7 +268,7 @@ _comp_cmd_ssh()
     _comp_initialize -n : -- "$@" || return
 
     local configfile
-    _ssh_configfile
+    _comp_cmd_ssh__configfile
 
     _comp_xfunc_ssh_suboption_check "$1" && return
 
@@ -371,7 +372,7 @@ _comp_cmd_sftp()
     _comp_initialize -- "$@" || return
 
     local configfile
-    _ssh_configfile
+    _comp_cmd_ssh__configfile
 
     _comp_xfunc_ssh_suboption_check && return
 
@@ -511,7 +512,7 @@ _comp_cmd_scp()
     _comp_initialize -n : -- "$@" || return
 
     local configfile
-    _ssh_configfile
+    _comp_cmd_ssh__configfile
 
     _comp_xfunc_ssh_suboption_check && {
         COMPREPLY=("${COMPREPLY[@]/%/ }")