style(_comp_awk): prefer awk -F <char> to awk -F<char>

We have been using the connected form of the `-F` option to the `awk`
command because Solaris awk does not support the separate form of the
option argument `-F <char>`.  Nevertheless, there are some cases of
the separate form in the codespace, though the majority is in the
connected form.  Since we now switch to `_comp_awk` for POSIX awk, we
unify them to the separate form `-F <char>`.

Author: akinomyoga

bash_completion

@@ -2329,7 +2329,7 @@ _comp_compgen_terms()
         _comp_expand_glob dirs '/{etc,lib,usr/lib,usr/share}/terminfo/?'
         ((${#dirs[@]})) &&
             find "${dirs[@]}" -type f -maxdepth 1 |
-            _comp_awk -F/ '{ print $NF }'
+            _comp_awk -F / '{ print $NF }'
     } 2>/dev/null)"
 }
 
@@ -2628,7 +2628,7 @@ _comp_compgen_known_hosts__impl()
         type avahi-browse &>/dev/null; then
         # Some old versions of avahi-browse reportedly didn't have -k
         # (even if mentioned in the manpage); those we do not support any more.
-        local generated=$(avahi-browse -cprak 2>/dev/null | _comp_awk -F';' \
+        local generated=$(avahi-browse -cprak 2>/dev/null | _comp_awk -F ';' \
             '/^=/ && $5 ~ /^_(ssh|workstation)\._tcp$/ { print $7 }' |
             sort -u)
         _comp_compgen -av known_hosts -- -P "$prefix" -S "$suffix" -W '$generated'

completions/_rfkill

@@ -17,9 +17,9 @@ _comp_cmd_rfkill()
                 ;;
             2)
                 if [[ $prev == block || $prev == unblock ]]; then
-                    _comp_compgen_split -- "$("$1" list |
-                        _comp_awk -F: '/^[0-9]/ {print $1}') all wifi bluetooth uwb
-                        wimax wwan gps"
+                    _comp_compgen_split -- "
+                        $("$1" list | _comp_awk -F : '/^[0-9]/ {print $1}')
+                        all wifi bluetooth uwb wimax wwan gps"
                 fi
                 ;;
         esac

completions/firefox

@@ -15,7 +15,7 @@ _comp_cmd_firefox()
             ;;
         -P)
             _comp_compgen_split -- "$(
-                _comp_awk -F= '$1 == "Name" { print $2 }' \
+                _comp_awk -F = '$1 == "Name" { print $2 }' \
                     ~/.mozilla/firefox/profiles.ini 2>/dev/null
             )"
             return

completions/gphoto2

@@ -30,7 +30,7 @@ _comp_cmd_gphoto2()
             ;;
         --camera)
             _comp_compgen_split -l -- "$("$1" --list-cameras 2>/dev/null |
-                _comp_awk -F'"' 'NR>2 { print $2 }')"
+                _comp_awk -F '"' 'NR>2 { print $2 }')"
             return
             ;;
         --get-config | --set-config | --set-config-index | --set-config-value)

completions/ktutil

@@ -9,7 +9,7 @@ _comp_cmd_ktutil__heimdal_principals()
 _comp_cmd_ktutil__heimdal_realms()
 {
     _comp_compgen_split -- "$(kadmin -l dump 2>/dev/null |
-        _comp_awk '{print $1}' | _comp_awk -F@ '{print $2}')"
+        _comp_awk '{print $1}' | _comp_awk -F @ '{print $2}')"
 }
 
 _comp_cmd_ktutil__heimdal_encodings()

completions/lilo

@@ -2,7 +2,7 @@
 
 _comp_cmd_lilo__labels()
 {
-    _comp_compgen_split -- "$(_comp_awk -F= '$1 ~ /^[ \t]*label$/ {print $2}' \
+    _comp_compgen_split -- "$(_comp_awk -F = '$1 ~ /^[ \t]*label$/ {print $2}' \
         "${1:-/etc/lilo.conf}" 2>/dev/null | command sed -e 's/\"//g')"
 }
 

completions/modprobe

@@ -98,7 +98,7 @@ _comp_cmd_modprobe()
                 else
                     _comp_compgen_split -S = -- "$(PATH="$PATH:/sbin" \
                         modinfo -p "$module" 2>/dev/null |
-                        _comp_awk -F: '!/^[ \t]/ { print $1 }')"
+                        _comp_awk -F : '!/^[ \t]/ { print $1 }')"
                     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
                 fi
             else

completions/pkg-get

@@ -16,7 +16,7 @@ _comp_cmd_pkg_get__catalog_file()
     conffile="${conffile:-/opt/csw/etc/pkg-get.conf}"
 
     if [[ ! $url ]]; then
-        url=$(_comp_awk -F= ' $1=="url" { print $2 }' "$conffile")
+        url=$(_comp_awk -F = ' $1=="url" { print $2 }' "$conffile")
     fi
 
     ret="${url##*//}"

completions/pkgutil

@@ -73,7 +73,7 @@ _comp_cmd_pkgutil()
     if [[ $command && $cur != -* ]]; then
 
         local mirrors mirror_url
-        mirrors=$(_comp_awk -F= ' $1 ~ /^ *mirror *$/ { print $2 }' "${configuration_files[@]}")
+        mirrors=$(_comp_awk -F = ' $1 ~ /^ *mirror *$/ { print $2 }' "${configuration_files[@]}")
         mirrors=${mirrors:-http://mirror.opencsw.org/opencsw/testing}
         for mirror_url in $mirrors; do
             _comp_cmd_pkgutil__url2catalog "$mirror_url"

completions/tipc

@@ -43,7 +43,7 @@ _comp_cmd_tipc__bearer()
         case "$media" in
             "udp")
                 local names=$(
-                    tipc bearer list 2>/dev/null | _comp_awk -F: '/^udp:/ {print $2}'
+                    tipc bearer list 2>/dev/null | _comp_awk -F : '/^udp:/ {print $2}'
                 )
                 _comp_compgen -- -W '$names'
                 ;;